scaleway · RoRoJ · Oct 21, 2024 · Oct 21, 2024 · Oct 22, 2024 · Oct 23, 2024
@@ -7,7 +7,7 @@ content:
   paragraph: Check availability details of Scaleway products.
 tags: availability region zone availability-zone
 dates:
-  validation: 2024-10-14
+  validation: 2024-10-21
   posted: 2023-01-05
 categories:
   - console
@@ -47,7 +47,9 @@ Scaleway products are available in multiple regions and locations worldwide. Thi
 |                           | Functions                             | Across Paris region    | Across Amsterdam region | Across Warsaw region   |
 |                           | Jobs                                  | Across Paris region    | Across Amsterdam region | Across Warsaw region   |
 |                           | SQL Databases                         | Across Paris region    | Not available yet       | Not available yet      |
-|                           | Messaging & Queuing                   | Across Paris region    | Across Amsterdam region | Not available yet      |
+|                           | NATS                                  | Across Paris region    | Across Amsterdam region | Not available yet      |
+|                           | Queues                                | Across Paris region    | Across Amsterdam region | Not available yet      |
+|                           | Topics and Events                     | Across Paris region    | Across Amsterdam region | Not available yet      |
 | **Managed Services**      | Web Hosting                           | Across Paris region    | Not available yet       | Not available yet      |
 |                           | IoT Hub                               | Across Paris region    | Not available yet       | Not available yet      |
 |                           | Transactional Email                   | Automatically assigned | Automatically assigned  | Automatically assigned |

@@ -22,7 +22,7 @@ The [Scaleway command line interface (CLI)](https://github.com/scaleway/scaleway
 | Instances                       | [Creating and managing an Instance with the CLI (v2)](/compute/instances/api-cli/creating-managing-instances-with-cliv2/) |
 | Instances                       | [Managing Instance snapshots with the CLI (v2)](/compute/instances/api-cli/managing-instance-snapshot-via-cli/) |
 | Elastic Metal                   | [Creating and Managing Elastic Metal servers with the CLI](/bare-metal/elastic-metal/api-cli/elastic-metal-with-cli/) |
-| Messaging and Queuing           | [Using the NATS CLI](/serverless/messaging/api-cli/nats-cli/) |
+| NATS                            | [Using the NATS CLI](/serverless/messaging/api-cli/nats-cli/) |
 | Kubernetes                      | [Creating and managing a Kubernetes Kapsule with the CLI (v2)](/containers/kubernetes/api-cli/creating-managing-kubernetes-lifecycle-cliv2/) |
 | Iot Hub                         | [Getting started with the IoT Hub CLI](/managed-services/iot-hub/api-cli/getting-started-with-iot-hub-cli/) |
 
diff --git a/faq/messaging-and-queuing.mdx b/faq/messaging-and-queuing.mdx
@@ -1,65 +1,46 @@
 ---
 meta:
-  title: Messaging and Queuing FAQ
-  description: Discover Scaleway Messaging and Queuing, and get answers to common questions about the different protocols available, compatibility with various services, and billing.
+  title: NATS, Queues, and Topics and Events FAQ
+  description: Discover Scaleway NATS, Queues, and Topics and Events, and get answers to common questions about the different protocols available, compatibility with various services, and billing.
 content:
-  h1: Messaging and Queuing
+  h1: NATS, Queues, and Topics and Events
 hero: assets/messaging.webp
 dates:
-  validation: 2024-09-26
+  validation: 2024-10-18
 category: serverless
 ---
 
+## What is NATS, Queues, and Topics and Events?
+
+These are three distinct managed message broker tools offered by Scaleway, based on the NATS, SQS and SNS protocols respectively. Previously, these products were grouped together as 'Messaging and Queuing', but have now become three separate products in their own right.
+
 ## What are NATS, SNS and SQS?
 
-NATS, SNS and SQS are all messaging protocols supported by Scaleway Messaging and Queuing. You can find out more about these protocols, and other essential Messaging and Queuing concepts, on our dedicated [concepts page](/serverless/messaging/concepts/).
+NATS, SNS and SQS are all messaging protocols used by the Scaleway NATS, Queues, and Topics and Events products. You can find out more about these protocols, and other essential concepts, on our dedicated [concepts page](/serverless/messaging/concepts/).
 
-## Is the Scaleway Messaging and Queuing SQS gateway compatible with my application, framework or tool?
+## Is the Scaleway Queues gateway compatible with my application, framework or tool?
 
-We currently implement the API endpoints listed [here](/serverless/messaging/reference-content/sqs-support/), which makes Scaleway Messaging and Queuing compatible with the AWS SDK as well as many other tools and frameworks including KEDA and Symfony. Note that you need to specify both Regions and URL to ensure compatibility.
+We currently implement the API endpoints listed [here](/serverless/messaging/reference-content/sqs-support/), which makes Scaleway Queues compatible with the AWS SDK as well as many other tools and frameworks including KEDA and Symfony. Note that you need to specify both Regions and URL to ensure compatibility.
 
-## Does Scaleway Messaging and Queuing support all SNS features?
+## Does Scaleway Topics and Events support all SNS features?
 
 The following subscriber types are supported:
 - HTTP/S clients
 - Serverless Functions and Containers
-- Scaleway Messaging and Queuing SQS queues
-
-For more details on supported and unsupported SNS features, see our [dedicated page](/serverless/messaging/reference-content/sns-support/).
-
-## Can I configure Messaging and Queuing via Terraform?
-
-Yes, check out our [tutorial](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/guides/mnq_with_nats_terraform_provider) on configuring Messaging and Queuing with the Terraform [NATS Jetstream provider](https://registry.terraform.io/providers/nats-io/jetstream/latest/docs).
-
-## What happened to my Messaging and Queuing namespaces?
-
-Messaging and Queuing namespaces have been removed.
-
-**NATS** namespaces and their credentials were automatically migrated to become [NATS accounts](/serverless/messaging/concepts/#nats-account), holding the same credentials you previously had in your namespace(s). You can manage your NATS accounts and namespaces from the new and improved Messaging and Queuing space in the [console](https://console.scaleway.com/) or our [`v1beta1` NATS API](https://www.scaleway.com/en/developers/api/messaging-and-queuing/nats-api/).
-
-**SQS/SNS** namespaces and their credentials were not automatically migrated, and users were warned to **migrate their resources themselves**.
-- Previously these protocols were combined, and shared namespaces/credentials, but now they have been separated.
-- You must [activate](/serverless/messaging/how-to/get-started/#how-to-activate-sqs-or-sns) the SQS and/or SNS protocols on your [Scaleway Project](/identity-and-access-management/organizations-and-projects/concepts/#project).
-- You must [recreate](/serverless/messaging/how-to/create-credentials/) your credentials (and any other resources e.g. queues) for the new "no-namespace" version of Messaging and Queuing.
-
-The new version of Messaging and Queuing is designed to provide a better and more secure experience, as well as preparing Messaging and Queuing for further integration into the Scaleway ecosystem.
-
-## Can I still keep using the old v1alpha1 API?
+- Scaleway Queues queues
 
-The v1alpha1 API has now been deprecated, and all resources still existing in it deleted.
+For more details on supported and unsupported Topics and Events features, see our [dedicated page](/serverless/messaging/reference-content/sns-support/).
 
-You must migrate by recreating your SQS and/or SNS resources on the new v1beta1 API (or via the console). NATS resources have been automatically migrated.
+## Can I configure Scaleway NATS via Terraform?
 
-- [Messaging and Queuing: SQS v1beta1 API](https://www.scaleway.com/en/developers/api/messaging-and-queuing/sqs-api/)
-- [Messaging and Queuing: SNS v1beta1 API](https://www.scaleway.com/en/developers/api/messaging-and-queuing/sns-api/)
-- [Messaging and Queuing: NATS v1beta1 API](https://www.scaleway.com/en/developers/api/messaging-and-queuing/nats-api/)
+Yes, check out our [tutorial](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/guides/mnq_with_nats_terraform_provider) on how to configure Scaleway NATS with the Terraform [NATS Jetstream provider](https://registry.terraform.io/providers/nats-io/jetstream/latest/docs).
 
-## How is Messaging and Queuing billed?
+## How are NATS, Queues, and Topics and Events billed?
 
-Billing for NATS and SQS is based on:
+Billing is based on:
 
 - For NATS: [Stream volume](/serverless/messaging/concepts/#stream-volume) (the total sum of each message's size going through the stream) and [stream persistence](/serverless/messaging/concepts/#stream-persistence) (the total amount of data stored * duration)
-- For SQS: [Queue volume](/serverless/messaging/concepts/#queue-volume) (the total sum of each message's size going through the queue)
-- For SNS : [Topic Volume](/serverless/messaging/concepts/#queue-volume)(the total sum of each message's size going out from the topic to the subscriptions)
+- For Queues: [Queue volume](/serverless/messaging/concepts/#queue-volume) (the total sum of each message's size going through the queue)
+- For Topics and Events: [Topic Volume](/serverless/messaging/concepts/#queue-volume)(the total sum of each message's size going out from the topic to the subscriptions)
 
 For full pricing details, see our [dedicated pricing page](https://www.scaleway.com/en/pricing/).
diff --git a/...anagement/organizations-and-projects/additional-content/organization-quotas.mdx b/...anagement/organizations-and-projects/additional-content/organization-quotas.mdx
@@ -261,13 +261,11 @@ The maximum RAM quota is obtained by multiplying the maximum scale factor of you
 For example, if you choose to create a container with 512 MB of memory and a max scale of 20, you will have 10 GB RAM.
 
 
-## Messaging and Queuing
+## NATS
 
-Scaleway Messaging and Queuing is a message broker tool that allows you to transfer messages between different microservices and platforms.
+Scaleway NATS is a message broker tool based on the NATS protocol, that allows you to transfer messages between different microservices and platforms.
 
-#### Usage limits
-
-The following usage limits are enforced as Organization quotas when using Messaging and Queuing:
+The following usage limits are enforced as Organization quotas when using Scaleway NATS:
 
 **NATS**
 
@@ -283,20 +281,28 @@ The following usage limits are enforced as Organization quotas when using Messag
 **This implies stream replication. If you choose to replicate your stream across all nodes (3), a storage limit of 100 MB applies.
 Note that in memory stream are not supported, please create your NATS stream using the `File` storage type.
 
+## Queues
+
+Scaleway Queues is a product for creating managed messaging queues based on the [SQS](/serverless/messaging/concepts/#nats) protocol. The following usage limits are enforced as Organization quotas when using Scaleway NATS:
+
+| Resource                                       | Criteria   | Limits   | Scope            |
+|------------------------------------------------|------------|----------|------------------|
+| Queue storage                                  | Max size   | 100 MB** | Scaleway Project |
+| Maximum payload                                | Max size   | 256 KB   | Queue            |
+| Max number of queues                           | Max number | 50       | Scaleway Project |
+| Message age / retention period                 | Max        | 14 days  | Message          |
+| Visibility timeout                             | Max        | 12 hours | Queue            |
+
+** This limit applies to all queues within your Scaleway Project, and covers the total storage used by all the queues in your Project.
+
+## Topics and Events
 
-**SQS/SNS**
+Topics and Events is a product for creating managed messaging topics based on the [SNS](/serverless/messaging/concepts/#sns) protocol. The following usage limits are enforced as Organization quotas when using Scaleway NATS:
 
 | Resource                                       | Criteria   | Limits   | Scope            |
 |------------------------------------------------|------------|----------|------------------|
-| SQS queue storage                              | Max size   | 100 MB** | Scaleway Project |
-| SQS maximum payload                            | Max size   | 256 KB   | SQS Queue        |
-| Max number of SQS queues                       | Max number | 50       | Scaleway Project |
-| Message age / retention period (SQS)           | Max        | 14 days  | Message          |
-| Visibility timeout                             | Max        | 12 hours | SQS queue        |
-| Max number of SNS topics                       | Max number | 50       | Scaleway Project |
-| Max number of SNS subscribers per topic        | Max number | 50       | Scaleway Project |
-
-** This limit applies to all your SQS queues within your Scaleway project and covers the total storage used by all the queues in your project.
+| Max number of topics                           | Max number | 50       | Scaleway Project |
+| Max number of subscribers per topic            | Max number | 50       | Scaleway Project |
 
 ## Storage
 

@@ -1,21 +1,21 @@
 ---
 meta:
-  title: Setting up and using TEM webhooks with SNS topics
+  title: Setting up and using TEM webhooks with Topics and Events
   description: Learn to monitor and manage email activity in Scaleway Transactional Email.
 content:
-  h1: Setting up and using TEM webhooks with SNS topics
+  h1: Setting up and using TEM webhooks with Topics and Events
   paragraph: Learn to monitor and manage email activity in Scaleway Transactional Email.
 tags: transactional webhooks sns managed-services
 dates:
-  validation: 2024-07-18
+  validation: 2024-10-21
   posted: 2024-07-18
 categories:
   - managed-services
 ---
 
 A webhook is an automated message sent in real-time from one system to another when a specific event happens, the message is typically conveyed using HTTP requests that are sent to an endpoint of your choice.
 
-You can set up webhooks for Scaleway Transaction Email and subscribe them to [Scaleway Messaging and Queueing SNS Topics](/serverless/messaging/how-to/create-manage-topics/) to have real-time event alerts sent to your endpoints.
+You can set up webhooks for Scaleway Transactional Email and subscribe them to [Topics and Events topics](/serverless/messaging/how-to/create-manage-topics/) to have real-time event alerts sent to your endpoints.
 
 
 <Macro id="requirements" />
@@ -26,7 +26,7 @@ You can set up webhooks for Scaleway Transaction Email and subscribe them to [Sc
 - Added [SPF, DKIM](/managed-services/transactional-email/how-to/add-spf-dkim-records-to-your-domain/), [MX](/managed-services/transactional-email/how-to/add-mx-record-to-your-domain/) and [DMARC](/managed-services/transactional-email/how-to/add-dmarc-record/) records to your domain(s)
 - Have the necessary quotas to use Transactional Email Webhooks during beta. You can request quotas from the [Scaleway betas page](https://www.scaleway.com/fr/betas/#email-webhooks).
 
-1. [Create an SNS topic](/serverless/messaging/how-to/create-manage-topics/#how-to-create-a-topic) with Scaleway Messaging and Queuing.
+1. [Create a Topics and Events topic](/serverless/messaging/how-to/create-manage-topics/#how-to-create-a-topic) with Scaleway Topics and Events.
 
 2. Copy the ARN identifier of the topic in the **Topics** tab as you will need it later.
 

@@ -7,7 +7,7 @@ content:
   paragraph: Learn to monitor and manage email activity in Scaleway Transactional Email.
 tags: transactional webhooks sns managed-services
 dates:
-  validation: 2024-08-07
+  validation: 2024-10-21
   posted: 2024-08-07
 categories:
   - managed-services
@@ -17,10 +17,10 @@ A webhook is an automated message sent in real-time from one system to another w
 
 They can be used to track and respond to email-related events such as deliveries, bounces and spam. You can also trigger automated processes or alerts based on specific email events and sync your email events with CRM systems, analytics platforms, or other services.
 
-You can set up webhooks for Scaleway Transactional Email and subscribe them to [Scaleway Messaging and Queueing SNS Topics](/serverless/messaging/how-to/create-manage-topics/) to have real-time event alerts sent to your endpoints in the Scaleway console.
+You can set up webhooks for Scaleway Transactional Email and subscribe them to [Scaleway Topics and Events](/serverless/messaging/how-to/create-manage-topics/) to have real-time event alerts sent to your endpoints in the Scaleway console.
 
 <Message type="note">
-  Currently, webhooks are integrated exclusively with the Scaleway Messaging and Queuing SNS. Billing for webhooks is based on the Scaleway [SNS billing](https://www.scaleway.com/en/pricing/managed-databases/#messaging-and-queuing).
+  Currently, webhooks are integrated exclusively with the Scaleway Topics and Events. Billing for webhooks is based on the Scaleway [Topics and Events billing](https://www.scaleway.com/en/pricing/managed-databases/#messaging-and-queuing).
 </Message>
 
 - A Scaleway account logged into the [console](https://console.scaleway.com)
@@ -44,9 +44,9 @@ You can create only one webhook per domain.
     <Message type="note">
     Webhook names must be between 3 and 127 characters.
     </Message>
-    - Select an existing SNS topic. Existing topics are displayed based on the region you select.
+    - Select an existing topic. Existing topics are displayed based on the region you select.
     <Message type="tip">
-    If you do not have an SNS topic, you can [create one](serverless/messaging/how-to/create-manage-topics/) with Scaleway Messaging and Queuing from the console.
+    If you do not have a topic, you can [create one](serverless/messaging/how-to/create-manage-topics/) with Scaleway Topics and Events from the console.
     </Message>
     - Choose the email events that will trigger the webhook and send information to your selected topic.
     <Message type="note">
@@ -72,6 +72,6 @@ Once you have created webhooks, you can delete them anytime.
 1. Click **Transactional Email** in the **Managed Services** section of the [console](https://console.scaleway.com/) side menu. Your domains display.
 2. Click the domain for which you want to delete a webhook.
 3. Click the **Webhooks** tab.
-4. Click <Icon name="more" /> > **Delete** next to the name of the webhook you want to delete. A pop-up appears to warn that linked topic and subscriptions will stay available in SNS.
+4. Click <Icon name="more" /> > **Delete** next to the name of the webhook you want to delete. A pop-up appears to warn that linked topic and subscriptions will stay available in Topics and Events.
 5. Click **Delete Webhook**.