diff --git a/.claude/settings.json b/.claude/settings.json
index 7a855d5c..a567af96 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -9,6 +9,16 @@
             "command": "filepath=\"$TOOL_INPUT_FILE_PATH\"; if echo \"$filepath\" | grep -qE '(\\.env|\\.github/workflows/|settings\\.local\\.json)$'; then echo 'BLOCK: Protected file - confirm with user first' >&2; exit 2; fi"
           }
         ]
+      },
+      {
+        "matcher": "Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash \"$CLAUDE_PROJECT_DIR/scripts/check-changelog-before-pr.sh\"",
+            "if": "Bash(gh pr create:*)"
+          }
+        ]
       }
     ],
     "PostToolUse": [
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1fd89186..ec39b2ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,7 +70,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -86,7 +86,7 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Cache SonarQube Cloud packages
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
@@ -237,7 +237,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
@@ -247,7 +247,7 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Cache NuGet packages
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props') }}
@@ -276,7 +276,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 38aa739d..d4e6ed04 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       - name: Setup .NET 10
         uses: actions/setup-dotnet@v5
@@ -34,7 +34,7 @@ jobs:
           bun-version: latest
 
       - name: Cache NuGet packages
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props') }}
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 5e3670b2..189276dd 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -49,7 +49,7 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/publish-libs.yml b/.github/workflows/publish-libs.yml
index de588e18..f9358993 100644
--- a/.github/workflows/publish-libs.yml
+++ b/.github/workflows/publish-libs.yml
@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0 # Fetching all history for version calculation and release notes (prev vs now)
 
diff --git a/.github/workflows/publish-template.yml b/.github/workflows/publish-template.yml
index cb2dd866..80df9946 100644
--- a/.github/workflows/publish-template.yml
+++ b/.github/workflows/publish-template.yml
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/validate-scripts.yml b/.github/workflows/validate-scripts.yml
index 3c520429..09d5efba 100644
--- a/.github/workflows/validate-scripts.yml
+++ b/.github/workflows/validate-scripts.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       - name: Install PowerShell Script Analyzer
         shell: pwsh
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..c8815f9a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Changelog
+
+All notable changes to this project are documented in this file, grouped by date.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+## [2026-07-15]
+
+### Added
+
+- **EventMarkdownGenerator**: `Topic` and `FullyQualifiedTopicName` are now exposed separately on `EventMetadata`
+  and `EventViewModel`. `Topic` is the plain topic / event hub name; `FullyQualifiedTopicName` is the composed
+  `{env}.{domain}.{visibility}.{topic}.{version}` convention string.
+- **EventMarkdownGenerator**: `--partition-key-attribute` option to discover partition keys by attribute name
+  (or name prefix), mirroring `--event-attribute`. Partition key discovery and its `Order` are now resolved
+  generically via reflection instead of a hardcoded `PartitionKeyAttribute` type.
+- **EventMarkdownGenerator**: event attributes may expose an optional `EventName` property to override the
+  documented event name (falls back to the CLR type name when absent).
+
+### Changed
+
+- **EventMarkdownGenerator**: `EventMetadata.TopicName` / `EventViewModel.TopicName` replaced by
+  `FullyQualifiedTopicName`. The default `event.liquid` template now renders both `Topic` and
+  `Fully Qualified Topic`.
+- **EventMarkdownGenerator**: multi-line XML doc property descriptions are flattened to a single line
+  (whitespace collapsed) so they no longer break the generated markdown payload table.
+
+### Fixed
+
+- **EventMarkdownGenerator**: property descriptions whose XML doc summary wrapped onto multiple lines
+  previously spilled out of their table cell as an orphaned line.
diff --git a/CLAUDE.md b/CLAUDE.md
index 74e6b995..8ec9d56c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,10 +7,22 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 **Momentum .NET** is a comprehensive template system that generates production-ready microservices solutions using .NET 10. The repository contains both the template engine (`mmt`) and supporting library ecosystem.
 
 **Key Components**:
+
 - **Template System** (`dotnet new mmt`): Generates complete microservices solutions
 - **Momentum Libraries**: Reusable .NET libraries for service defaults, extensions, and patterns
 - **Sample Application** (AppDomain): Complete microservices example demonstrating patterns
 
+## Changelog & Pull Requests
+
+**Every PR must update `CHANGELOG.md` before it is created.** Add a `## [YYYY-MM-DD]` section (today's
+date; reuse it if a section for today already exists) using the [Keep a Changelog](https://keepachangelog.com/)
+categories (`Added`, `Changed`, `Deprecated`, `Removed`, `Fixed`, `Security`). Do this as the last step
+before opening the PR.
+
+A `PreToolUse` hook (`scripts/check-changelog-before-pr.sh`, wired in `.claude/settings.json`) blocks
+`gh pr create` when `CHANGELOG.md` has not been touched on the current branch. If it blocks you, add a
+changelog entry and retry.
+
 ## Development Commands
 
 ### Template Development and Testing
@@ -91,6 +103,7 @@ cd docs && bun install && bun run dev
 ```
 
 **Aspire Database Setup**:
+
 - PostgreSQL with persistent storage
 - Automatic Liquibase migrations on startup
 - PgAdmin for database management
@@ -98,6 +111,7 @@ cd docs && bun install && bun run dev
 - Services wait for database and migrations before starting
 
 **Database Connection**:
+
 - Services automatically get connection strings from Aspire
 - Health checks validate connectivity and schema integrity
 - LinqToDB configured with snake_case naming conventions
@@ -139,6 +153,7 @@ dotnet test libs/Momentum/tests/Momentum.Extensions.SourceGenerators.Tests
 The template (`mmt`) generates microservices solutions with:
 
 **Generated Project Structure**:
+
 ```
 YourService/
 ├── src/
@@ -157,6 +172,7 @@ YourService/
 ```
 
 **Template Configuration**:
+
 - Components: `--api`, `--backoffice`, `--orleans`, `--aspire`, `--docs`, `--bff`
 - Infrastructure: `--db-config [default|none|npgsql|liquibase]`, `--kafka`
 - Customization: `--org "Company"`, `--port 8100`, `--no-sample`
@@ -188,6 +204,7 @@ YourService/
 ### Technology Stack Integration
 
 **Core Technologies**:
+
 - **.NET 10** with **Aspire**: Orchestration and observability
 - **Wolverine**: CQRS message handling with PostgreSQL persistence
 - **Orleans**: Stateful actor processing (optional)
@@ -196,6 +213,7 @@ YourService/
 - **OpenTelemetry**: Distributed tracing and metrics
 
 **Port Allocation** (base port configurable, default 8100):
+
 - Aspire Dashboard: 18110 (HTTPS), 18100 (HTTP)
 - API: 8111 (HTTPS), 8101 (HTTP), 8102 (gRPC)
 - BackOffice: 8113 (HTTPS), 8103 (HTTP)
@@ -219,19 +237,22 @@ YourService/
 The `--local` flag enables template testing with locally built Momentum libraries:
 
 **What it does**:
+
 - Copies `local-mmt-version.txt` and `local-feed-path.txt` to the generated project
 - The post-setup tool reads these files and:
-  - Hardcodes the local version into `Directory.Packages.props` (`MomentumVersion`)
-  - Creates a `nuget.config` with the local NuGet feed source
-  - Cleans up the text files
+    - Hardcodes the local version into `Directory.Packages.props` (`MomentumVersion`)
+    - Creates a `nuget.config` with the local NuGet feed source
+    - Cleans up the text files
 - Automatically used by `Run-TemplateTests.ps1` for template testing
 
 **How the lib build generates local packages**:
+
 - `libs/Momentum/Directory.Build.targets` generates version `1000.0.0-pre.{timestamp}`
 - Packs all libraries to `libs/Momentum/.local/nuget/`
 - Writes `local-mmt-version.txt` and `local-feed-path.txt` to the repo root
 
 **Usage**:
+
 ```bash
 # Build and pack libraries first
 dotnet build libs/Momentum/Momentum.slnx
@@ -330,6 +351,7 @@ await messageBus.PublishAsync(new CustomerCreated(customer.Id, customer.Name));
 ### MSBuild Properties
 
 Global configuration in `Directory.Build.props`:
+
 - **Target Framework**: .NET 10.0
 - **Nullable Reference Types**: Enabled
 - **Analyzers**: .NET analyzers + SonarAnalyzer enabled
@@ -351,23 +373,27 @@ Template uses sophisticated conditional compilation:
 ### Template vs Library Development
 
 The repository serves dual purposes:
+
 - **Template development**: Testing and building the `mmt` template
 - **Library development**: Standalone Momentum libraries in `libs/Momentum/`
 
 ### Database Migrations
 
 Uses Liquibase for version-controlled schema management:
+
 - Setup scripts in `infra/YourService.Database/Liquibase/`
 - Automatic migration via Docker Compose
 - Separate service_bus and application schemas
 
 **IMPORTANT - Database Organization Rules**:
+
 - **Table Definitions**: Each table should be in its own file under `tables/` directory
 - **Constraints & Indexes**: Should be defined WITHIN the same file as the table they apply to
 - **Avoid Separate Constraint Files**: Do NOT create separate `constraints_and_indexes.sql` files
 - **Logical Grouping**: Keep related constraints, indexes, triggers, and functions with their tables
 
 **Correct Structure**:
+
 ```
 infra/YourService.Database/Liquibase/main/
 ├── main.sql                    # Schema creation
@@ -384,6 +410,7 @@ infra/YourService.Database/Liquibase/main/
 ```
 
 **Example Table File Structure**:
+
 ```sql
 -- Table creation
 CREATE TABLE main.invoices (...);
@@ -410,59 +437,66 @@ CREATE TRIGGER tr_invoice_version BEFORE UPDATE ON main.invoices ...;
 **Common Problems and Solutions**:
 
 1. **Health Checks Failing**:
-   ```bash
-   # Check if database is running
-   curl http://localhost:8101/status
 
-   # Check Aspire dashboard for service status
-   open https://localhost:18110
-   ```
+    ```bash
+    # Check if database is running
+    curl http://localhost:8101/status
+
+    # Check Aspire dashboard for service status
+    open https://localhost:18110
+    ```
 
 2. **Migration Issues**:
-   ```bash
-   # Check Liquibase logs in Aspire dashboard
-   # Verify changelog.xml includes all table files
-   # Ensure changesets have unique IDs
-   ```
+
+    ```bash
+    # Check Liquibase logs in Aspire dashboard
+    # Verify changelog.xml includes all table files
+    # Ensure changesets have unique IDs
+    ```
 
 3. **Missing Constraints/Indexes**:
-   ```sql
-   -- Verify constraints exist
-   SELECT constraint_name, constraint_type
-   FROM information_schema.table_constraints
-   WHERE table_schema = 'main';
-
-   -- Verify indexes exist
-   SELECT schemaname, tablename, indexname
-   FROM pg_indexes
-   WHERE schemaname = 'main';
-   ```
+
+    ```sql
+    -- Verify constraints exist
+    SELECT constraint_name, constraint_type
+    FROM information_schema.table_constraints
+    WHERE table_schema = 'main';
+
+    -- Verify indexes exist
+    SELECT schemaname, tablename, indexname
+    FROM pg_indexes
+    WHERE schemaname = 'main';
+    ```
 
 4. **Connection String Issues**:
-   - Aspire automatically configures connection strings
-   - Check appsettings.json for overrides
-   - Verify service references in AppHost Program.cs
+    - Aspire automatically configures connection strings
+    - Check appsettings.json for overrides
+    - Verify service references in AppHost Program.cs
 
 ### Observability Integration
 
 Complete observability stack configured by default:
+
 - **Structured Logging**: Serilog with enrichment
 - **Metrics**: OpenTelemetry with custom meters
 - **Tracing**: Distributed tracing across services
 - **Health Checks**: Built-in health endpoints
 
 **Health Check Endpoints**:
+
 - `/status` - Liveness probe (cached status, no auth)
 - `/health/internal` - Readiness probe (localhost only, detailed in dev)
 - `/health` - Public health check (requires auth, detailed)
 
 **Database Health Checks**:
+
 - Connectivity validation
 - Schema verification (tables, constraints, indexes)
 - Basic data access testing
 - Constraint and foreign key validation
 
 **Aspire Configuration**:
+
 - Database resources with health checks
 - Liquibase migration dependencies
 - Service orchestration with proper wait conditions
@@ -471,6 +505,7 @@ Complete observability stack configured by default:
 ### Development vs Production Configuration
 
 Template generates environment-specific configurations:
+
 - **Development**: Uses Aspire dashboard, verbose logging
 - **Production**: Optimized for container deployment
 - **Docker Compose**: Full-stack local development environment
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8e592f46..bb913544 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,11 +1,12 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AspireVersion>13.4.3</AspireVersion>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <AspireVersion>13.4.6</AspireVersion>
     <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
-    <MicrosoftExtensionsVersion>10.0.9</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsVersion>10.0.10</MicrosoftExtensionsVersion>
     <!--#if (INCLUDE_ORLEANS) -->
-    <MicrosoftOrleansVersion>10.1.0</MicrosoftOrleansVersion>
+    <MicrosoftOrleansVersion>10.2.1</MicrosoftOrleansVersion>
     <!--#endif -->
     <OpenTelemetryCoreVersion>1.16.0</OpenTelemetryCoreVersion>
     <OpenTelemetryInstrumentationVersion>1.15.1</OpenTelemetryInstrumentationVersion>
@@ -42,18 +43,20 @@
     <PackageVersion Include="FluentValidation" Version="12.1.1" />
     <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
     <!--#if (INCLUDE_GRPC) -->
-    <PackageVersion Include="Google.Protobuf" Version="3.35.0" />
+    <PackageVersion Include="Google.Protobuf" Version="3.35.1" />
     <PackageVersion Include="Grpc.AspNetCore" Version="$(GrpcVersion)" />
     <PackageVersion Include="Grpc.AspNetCore.Server.Reflection" Version="$(GrpcVersion)" />
     <PackageVersion Include="Grpc.AspNetCore.Web" Version="$(GrpcVersion)" />
     <PackageVersion Include="Grpc.Net.Client" Version="$(GrpcVersion)" />
-    <PackageVersion Include="Grpc.Tools" Version="2.80.0" />
+    <PackageVersion Include="Grpc.Tools" Version="2.82.0" />
     <!--#endif -->
     <PackageVersion Include="linq2db" Version="6.3.0" />
     <PackageVersion Include="linq2db.Extensions" Version="6.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftExtensionsVersion)" />
+    <!-- Transitive from Microsoft.AspNetCore.OpenApi; pinned to patch GHSA-v5pm-xwqc-g5wc (stack overflow on circular schema refs) -->
+    <PackageVersion Include="Microsoft.OpenApi" Version="2.7.5" />
     <PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
@@ -82,6 +85,8 @@
     <PackageVersion Include="Microsoft.Orleans.Dashboard" Version="$(MicrosoftOrleansVersion)" />
     <PackageVersion Include="Microsoft.Orleans.GrainDirectory.AzureStorage" Version="$(MicrosoftOrleansVersion)" />
     <!--#endif -->
+    <!-- Transitive from Aspire.Hosting.AppHost (and Orleans when included); pinned to patch GHSA-hv8m-jj95-wg3x and related LZ4/MessagePack advisories -->
+    <PackageVersion Include="MessagePack" Version="2.5.302" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.300" />
     <PackageVersion Include="Momentum.Extensions" Version="$(MomentumVersion)" />
     <PackageVersion Include="Momentum.Extensions.Abstractions" Version="$(MomentumVersion)" />
@@ -95,20 +100,20 @@
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="OneOf" Version="3.0.271" />
     <PackageVersion Include="OneOf.SourceGenerator" Version="3.0.271" />
-    <PackageVersion Include="Refit" Version="10.1.6" />
-    <PackageVersion Include="Refit.HttpClientFactory" Version="11.0.1" />
+    <PackageVersion Include="Refit" Version="13.1.0" />
+    <PackageVersion Include="Refit.HttpClientFactory" Version="13.1.0" />
     <PackageVersion Include="Refitter.MSBuild" Version="2.0.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryCoreVersion)" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryCoreVersion)" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.16.0" />
     <!--#if (INCLUDE_GRPC) -->
-    <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcCore" Version="1.0.0-beta.11" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcCore" Version="1.0.0-beta.13" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.15.0-beta.1" />
     <!--#endif -->
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryInstrumentationVersion)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryInstrumentationVersion)" />
     <PackageVersion Include="Riok.Mapperly" Version="4.3.1" />
-    <PackageVersion Include="Scalar.AspNetCore" Version="2.16.3" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.16.11" />
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
@@ -116,9 +121,9 @@
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.27.0.140913" />
     <PackageVersion Include="Spectre.Console.Cli" Version="0.55.0" />
     <PackageVersion Include="System.Net.Http.Json" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageVersion Include="Testcontainers" Version="4.12.0" />
-    <PackageVersion Include="Testcontainers.Kafka" Version="4.12.0" />
-    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.12.0" />
+    <PackageVersion Include="Testcontainers" Version="4.13.0" />
+    <PackageVersion Include="Testcontainers.Kafka" Version="4.13.0" />
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.13.0" />
     <PackageVersion Include="WolverineFx" Version="5.39.2" />
     <!--#if (USE_KAFKA) -->
     <PackageVersion Include="WolverineFx.Kafka" Version="5.39.0" />
diff --git a/docs/bun.lock b/docs/bun.lock
index 1425f196..eac01c2b 100644
--- a/docs/bun.lock
+++ b/docs/bun.lock
@@ -10,8 +10,8 @@
         "yaml": "^2.8.1",
       },
       "devDependencies": {
-        "@mermaid-js/layout-elk": "^0.1.7",
-        "@types/node": "^25.2.3",
+        "@mermaid-js/layout-elk": "^0.2.1",
+        "@types/node": "^26.0.0",
         "markdown-it": "^14.1.0",
         "mermaid": "^11.10.1",
         "vitepress": "^1.6.4",
@@ -137,7 +137,7 @@
 
     "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="],
 
-    "@mermaid-js/layout-elk": ["@mermaid-js/layout-elk@0.1.9", "", { "dependencies": { "d3": "^7.9.0", "elkjs": "^0.9.3" }, "peerDependencies": { "mermaid": "^11.0.2" } }, "sha512-HuvaqFZBr6yT9PpWYockvKAZPJVd89yn/UjOYPxhzbZxlybL2v+2BjVCg7MVH6vRs1irUohb/s42HEdec1CCZw=="],
+    "@mermaid-js/layout-elk": ["@mermaid-js/layout-elk@0.2.2", "", { "dependencies": { "d3": "^7.9.0", "elkjs": "^0.9.3" }, "peerDependencies": { "mermaid": "^11.0.2" } }, "sha512-vnH3gtqfhyBiRVKNpT8iDENTw18q/OF0GF/SfYfHN43KZpu+6eZDEOMHTfNYAkpmUWJNgtRQFIS6BTc7vH/DYQ=="],
 
     "@mermaid-js/parser": ["@mermaid-js/parser@0.6.3", "", { "dependencies": { "langium": "3.3.1" } }, "sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA=="],
 
@@ -277,7 +277,7 @@
 
     "@types/mdurl": ["@types/mdurl@2.0.0", "", {}, "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg=="],
 
-    "@types/node": ["@types/node@25.3.0", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A=="],
+    "@types/node": ["@types/node@26.1.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw=="],
 
     "@types/trusted-types": ["@types/trusted-types@2.0.7", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="],
 
@@ -611,7 +611,7 @@
 
     "ufo": ["ufo@1.6.1", "", {}, "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA=="],
 
-    "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
+    "undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
 
     "unist-util-is": ["unist-util-is@6.0.1", "", { "dependencies": { "@types/unist": "^3.0.0" } }, "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g=="],
 
diff --git a/docs/package.json b/docs/package.json
index e5cc462e..0c54bc73 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@mermaid-js/layout-elk": "^0.2.1",
-    "@types/node": "^25.2.3",
+    "@types/node": "^26.0.0",
     "markdown-it": "^14.1.0",
     "mermaid": "^11.10.1",
     "vitepress": "^1.6.4"
diff --git a/libs/Momentum/Directory.Build.props b/libs/Momentum/Directory.Build.props
index 56a7d736..79719736 100644
--- a/libs/Momentum/Directory.Build.props
+++ b/libs/Momentum/Directory.Build.props
@@ -7,7 +7,8 @@
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
         <CodeAnalysisRuleSet>../../Momentum.ruleset</CodeAnalysisRuleSet>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NoWarn>$(NoWarn);CS1591;LOGGEN036;LOGGEN031;S3267;NU1603</NoWarn>
+        <!-- NU5104: OpenTelemetry.Instrumentation.GrpcNetClient has never shipped a stable release (all versions are -beta/-rc upstream) -->
+        <NoWarn>$(NoWarn);CS1591;LOGGEN036;LOGGEN031;S3267;NU1603;NU5104</NoWarn>
         <BaseVersion Condition="'$(BaseVersion)' == ''">1000.0.0</BaseVersion>
         <!-- Fixed version for local debug builds. Since .local/nuget/ is cleaned before each
              build, only one version ever exists. ClearNuGetCache in Directory.Build.targets
diff --git a/libs/Momentum/docs/bun.lock b/libs/Momentum/docs/bun.lock
index d9b16db6..b05839f8 100644
--- a/libs/Momentum/docs/bun.lock
+++ b/libs/Momentum/docs/bun.lock
@@ -10,9 +10,9 @@
         "yaml": "^2.8.1",
       },
       "devDependencies": {
-        "@mermaid-js/layout-elk": "^0.1.7",
+        "@mermaid-js/layout-elk": "^0.2.1",
         "@types/bun": "^1.2.14",
-        "@types/node": "^25.2.3",
+        "@types/node": "^26.0.0",
         "markdown-it": "^14.1.0",
         "mermaid": "^11.10.1",
         "vitepress": "^1.6.4",
@@ -140,7 +140,7 @@
 
     "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="],
 
-    "@mermaid-js/layout-elk": ["@mermaid-js/layout-elk@0.1.9", "", { "dependencies": { "d3": "^7.9.0", "elkjs": "^0.9.3" }, "peerDependencies": { "mermaid": "^11.0.2" } }, "sha512-HuvaqFZBr6yT9PpWYockvKAZPJVd89yn/UjOYPxhzbZxlybL2v+2BjVCg7MVH6vRs1irUohb/s42HEdec1CCZw=="],
+    "@mermaid-js/layout-elk": ["@mermaid-js/layout-elk@0.2.2", "", { "dependencies": { "d3": "^7.9.0", "elkjs": "^0.9.3" }, "peerDependencies": { "mermaid": "^11.0.2" } }, "sha512-vnH3gtqfhyBiRVKNpT8iDENTw18q/OF0GF/SfYfHN43KZpu+6eZDEOMHTfNYAkpmUWJNgtRQFIS6BTc7vH/DYQ=="],
 
     "@mermaid-js/parser": ["@mermaid-js/parser@0.6.2", "", { "dependencies": { "langium": "3.3.1" } }, "sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ=="],
 
@@ -278,7 +278,7 @@
 
     "@types/mdurl": ["@types/mdurl@2.0.0", "", {}, "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg=="],
 
-    "@types/node": ["@types/node@25.3.0", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-4K3bqJpXpqfg2XKGK9bpDTc6xO/xoUP/RBWS7AtRMug6zZFaRekiLzjVtAoZMquxoAbzBvy5nxQ7veS5eYzf8A=="],
+    "@types/node": ["@types/node@26.1.1", "", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw=="],
 
     "@types/trusted-types": ["@types/trusted-types@2.0.7", "", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="],
 
@@ -630,7 +630,7 @@
 
     "ufo": ["ufo@1.6.1", "", {}, "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA=="],
 
-    "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
+    "undici-types": ["undici-types@8.3.0", "", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
 
     "unist-util-is": ["unist-util-is@6.0.0", "", { "dependencies": { "@types/unist": "3.0.3" } }, "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw=="],
 
diff --git a/libs/Momentum/docs/package.json b/libs/Momentum/docs/package.json
index a4d17b47..cd0a6eb9 100644
--- a/libs/Momentum/docs/package.json
+++ b/libs/Momentum/docs/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@mermaid-js/layout-elk": "^0.2.1",
     "@types/bun": "^1.2.14",
-    "@types/node": "^25.2.3",
+    "@types/node": "^26.0.0",
     "markdown-it": "^14.1.0",
     "mermaid": "^11.10.1",
     "vitepress": "^1.6.4"
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/GenerateCommand.cs b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/GenerateCommand.cs
index 31a8b2e0..e788134c 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/GenerateCommand.cs
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/GenerateCommand.cs
@@ -54,6 +54,11 @@ public sealed class Settings : CommandSettings
         [DefaultValue("EventTopicAttribute")]
         public string EventAttribute { get; init; } = "EventTopicAttribute";
 
+        [CommandOption("--partition-key-attribute")]
+        [Description("Name (or name prefix) of the attribute used to discover partition keys. Default: PartitionKeyAttribute")]
+        [DefaultValue("PartitionKeyAttribute")]
+        public string PartitionKeyAttribute { get; init; } = "PartitionKeyAttribute";
+
         [CommandOption("-v|--verbose")]
         [Description("Enable verbose output")]
         public bool Verbose { get; init; }
@@ -92,7 +97,8 @@ protected override async Task<int> ExecuteAsync(CommandContext context, Settings
                 TemplatesDirectory = settings.Templates,
                 GitHubBaseUrl = settings.GitHubUrl,
                 SerializationFormat = settings.Format,
-                EventAttributeName = settings.EventAttribute
+                EventAttributeName = settings.EventAttribute,
+                PartitionKeyAttributeName = settings.PartitionKeyAttribute
             };
 
             await GenerateDocumentationAsync(options, cancellationToken);
@@ -152,7 +158,8 @@ private static async Task GenerateDocumentationAsync(GeneratorOptions options, C
                     () => LoadAssemblyWithDependencyResolution(assemblyPath, out loadContext),
                     cts.Token);
 
-                var events = AssemblyEventDiscovery.DiscoverEvents(assembly, xmlParser, calculator, options.EventAttributeName);
+                var events = AssemblyEventDiscovery.DiscoverEvents(assembly, xmlParser, calculator,
+                    options.EventAttributeName, options.PartitionKeyAttributeName);
 
                 foreach (var eventMetadata in events)
                 {
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/EventMetadata.cs b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/EventMetadata.cs
index 1c8550a9..5949d637 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/EventMetadata.cs
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/EventMetadata.cs
@@ -9,7 +9,8 @@ public record EventMetadata
     public required string EventName { get; init; }
     public required string FullTypeName { get; init; }
     public required string Namespace { get; init; }
-    public required string TopicName { get; init; }
+    public required string Topic { get; init; }
+    public required string FullyQualifiedTopicName { get; init; }
     public required string Domain { get; init; }
     public required string Version { get; init; }
     public required bool IsInternal { get; init; }
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/GeneratorOptions.cs b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/GeneratorOptions.cs
index bbde4513..26fce68b 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/GeneratorOptions.cs
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Models/GeneratorOptions.cs
@@ -22,6 +22,9 @@ public record GeneratorOptions
     /// <summary>Name (or name prefix) of the attribute used to discover events. Default: "EventTopicAttribute".</summary>
     public string EventAttributeName { get; init; } = "EventTopicAttribute";
 
+    /// <summary>Name (or name prefix) of the attribute used to discover partition keys. Default: "PartitionKeyAttribute".</summary>
+    public string PartitionKeyAttributeName { get; init; } = "PartitionKeyAttribute";
+
     public string GetSidebarPath() => Path.Combine(OutputDirectory, Path.GetFileName(SidebarFileName));
 
     public void EnsureOutputDirectoryExists()
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/README.md b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/README.md
index dcadf10d..ae2a53af 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/README.md
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/README.md
@@ -79,15 +79,17 @@ events-docsgen [OPTIONS]
 
 **Required Options:**
 
--   `-a|--assemblies <ASSEMBLIES>`: Comma-separated list of assembly paths to scan for events
+- `-a|--assemblies <ASSEMBLIES>`: Comma-separated list of assembly paths to scan for events
 
 **Optional Options:**
 
--   `--xml-docs <XML_DOCS>`: Comma-separated list of XML documentation file paths (auto-discovered if not provided)
--   `-o|--output <OUTPUT>`: Output directory for generated documentation (default: `./docs/events/`)
--   `--sidebar-file <SIDEBAR_FILE>`: Filename for sidebar navigation JSON (default: `events-sidebar.json`)
--   `--templates <TEMPLATES>`: Directory containing custom Liquid templates
--   `-v|--verbose`: Enable verbose output for debugging
+- `--xml-docs <XML_DOCS>`: Comma-separated list of XML documentation file paths (auto-discovered if not provided)
+- `-o|--output <OUTPUT>`: Output directory for generated documentation (default: `./docs/events/`)
+- `--sidebar-file <SIDEBAR_FILE>`: Filename for sidebar navigation JSON (default: `events-sidebar.json`)
+- `--templates <TEMPLATES>`: Directory containing custom Liquid templates
+- `--event-attribute <NAME>`: Name (or name prefix) of the attribute used to discover events (default: `EventTopicAttribute`)
+- `--partition-key-attribute <NAME>`: Name (or name prefix) of the attribute used to discover partition keys (default: `PartitionKeyAttribute`)
+- `-v|--verbose`: Enable verbose output for debugging
 
 **Examples:**
 
@@ -112,8 +114,8 @@ events-docsgen copy-templates [OPTIONS]
 
 **Options:**
 
--   `-o|--output <OUTPUT>`: Output directory for template files (default: `./templates`)
--   `-f|--force`: Overwrite existing template files if they exist
+- `-o|--output <OUTPUT>`: Output directory for template files (default: `./templates`)
+- `-f|--force`: Overwrite existing template files if they exist
 
 **Examples:**
 
@@ -176,22 +178,22 @@ docs/events/
 
 Each generated event documentation includes:
 
--   **Event Metadata**: Status, version, Kafka topic, entity information
--   **Description**: Extracted from XML documentation comments
--   **Structured Remarks**: Organized sections from XML `<remarks>` tags
--   **Event Payload**: Table showing all properties with types and descriptions
--   **Partition Keys**: Information about Kafka partitioning strategy
--   **Referenced Schemas**: Links to complex type documentation
--   **Technical Details**: Size estimates and deprecation warnings
--   **Source Link**: GitHub link to event definition (when configured)
+- **Event Metadata**: Status, version, Kafka topic, entity information
+- **Description**: Extracted from XML documentation comments
+- **Structured Remarks**: Organized sections from XML `<remarks>` tags
+- **Event Payload**: Table showing all properties with types and descriptions
+- **Partition Keys**: Information about Kafka partitioning strategy
+- **Referenced Schemas**: Links to complex type documentation
+- **Technical Details**: Size estimates and deprecation warnings
+- **Source Link**: GitHub link to event definition (when configured)
 
 ### Schema Documentation
 
 Complex types referenced by events get their own schema documentation:
 
--   **Type Information**: Full type name and description
--   **Properties Table**: All properties with types, requirements, and descriptions
--   **Nested Schema Links**: References to other complex types
+- **Type Information**: Full type name and description
+- **Properties Table**: All properties with types, requirements, and descriptions
+- **Nested Schema Links**: References to other complex types
 
 ## Template Customization
 
@@ -324,9 +326,9 @@ public record UserCreated(Guid UserId, string Name);
 
 **Solutions**:
 
--   Enable XML documentation generation in your project: `<GenerateDocumentationFile>true</GenerateDocumentationFile>`
--   Manually specify XML documentation paths: `--xml-docs "path/to/MyApp.xml"`
--   Ensure XML documentation files are in the same directory as assemblies
+- Enable XML documentation generation in your project: `<GenerateDocumentationFile>true</GenerateDocumentationFile>`
+- Manually specify XML documentation paths: `--xml-docs "path/to/MyApp.xml"`
+- Ensure XML documentation files are in the same directory as assemblies
 
 ### Assembly Loading Issues
 
@@ -334,9 +336,9 @@ public record UserCreated(Guid UserId, string Name);
 
 **Solutions**:
 
--   Ensure all dependent assemblies are in the same directory as the target assembly
--   Use absolute paths when specifying assembly locations
--   Check that the assembly was built for a compatible .NET framework
+- Ensure all dependent assemblies are in the same directory as the target assembly
+- Use absolute paths when specifying assembly locations
+- Check that the assembly was built for a compatible .NET framework
 
 ### Template Errors
 
@@ -344,16 +346,16 @@ public record UserCreated(Guid UserId, string Name);
 
 **Solutions**:
 
--   Validate Liquid syntax using online Liquid template validators
--   Check that all referenced variables exist in the template context
--   Review default templates as reference for correct syntax and available variables
+- Validate Liquid syntax using online Liquid template validators
+- Check that all referenced variables exist in the template context
+- Review default templates as reference for correct syntax and available variables
 
 ### Common Error Messages
 
--   **"Assembly not found"**: Check assembly paths and ensure files exist
--   **"No XML documentation found"**: Enable XML documentation generation or specify paths manually
--   **"Template parsing failed"**: Verify Liquid template syntax is correct
--   **"No events discovered"**: Ensure events have `EventTopic` attributes
+- **"Assembly not found"**: Check assembly paths and ensure files exist
+- **"No XML documentation found"**: Enable XML documentation generation or specify paths manually
+- **"Template parsing failed"**: Verify Liquid template syntax is correct
+- **"No events discovered"**: Ensure events have `EventTopic` attributes
 
 ## Architecture Notes
 
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/AssemblyEventDiscovery.cs b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/AssemblyEventDiscovery.cs
index e0cbf132..955025c7 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/AssemblyEventDiscovery.cs
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/AssemblyEventDiscovery.cs
@@ -10,14 +10,17 @@ namespace Momentum.Extensions.EventMarkdownGenerator.Services;
 public static class AssemblyEventDiscovery
 {
     private const string DefaultAttributeNamePrefix = nameof(EventTopicAttribute);
+    private const string DefaultPartitionKeyAttributeNamePrefix = nameof(PartitionKeyAttribute);
 
     public static IEnumerable<EventMetadata> DiscoverEvents(Assembly assembly, XmlDocumentationParser? xmlParser,
-        PayloadSizeCalculator calculator, string attributeNamePrefix = DefaultAttributeNamePrefix)
+        PayloadSizeCalculator calculator, string attributeNamePrefix = DefaultAttributeNamePrefix,
+        string partitionKeyAttributeNamePrefix = DefaultPartitionKeyAttributeNamePrefix)
     {
         var defaultDomain = GetMainDomainName(assembly);
         var integrationEventTypes = GetEventTypes(assembly, attributeNamePrefix);
 
-        return integrationEventTypes.Select(type => CreateEventMetadata(type, defaultDomain, xmlParser, calculator, attributeNamePrefix));
+        return integrationEventTypes.Select(type =>
+            CreateEventMetadata(type, defaultDomain, xmlParser, calculator, attributeNamePrefix, partitionKeyAttributeNamePrefix));
     }
 
     private static IEnumerable<Type> GetEventTypes(Assembly assembly, string attributeNamePrefix)
@@ -48,17 +51,19 @@ private static bool IsEventType(Type type, string attributeNamePrefix)
     }
 
     private static EventMetadata CreateEventMetadata(Type eventType, string defaultDomain,
-        XmlDocumentationParser? xmlParser, PayloadSizeCalculator calculator, string attributeNamePrefix)
+        XmlDocumentationParser? xmlParser, PayloadSizeCalculator calculator, string attributeNamePrefix,
+        string partitionKeyAttributeNamePrefix)
     {
         // Use dynamic attribute handling to work across assembly contexts
         var topicAttribute = GetEventTopicAttributeDynamic(eventType, attributeNamePrefix);
         var obsoleteAttribute = eventType.GetCustomAttribute<ObsoleteAttribute>();
-        var (properties, partitionKeys) = GetEventPropertiesAndPartitionKeys(eventType, xmlParser, calculator);
+        var (properties, partitionKeys) =
+            GetEventPropertiesAndPartitionKeys(eventType, xmlParser, calculator, partitionKeyAttributeNamePrefix);
 
         var topicName = GetTopicName(topicAttribute, eventType);
 
         // Access properties via reflection for cross-assembly compatibility
-        var (shouldPluralize, domain, isInternal, version) = GetTopicAttributeProperties(topicAttribute);
+        var (shouldPluralize, domain, isInternal, version, eventNameOverride) = GetTopicAttributeProperties(topicAttribute);
 
         // Simple pluralization fallback - add 's' to the end
         // This is a fallback when the extension method is not available
@@ -78,10 +83,11 @@ private static EventMetadata CreateEventMetadata(Type eventType, string defaultD
 
         return new EventMetadata
         {
-            EventName = eventType.Name,
+            EventName = !string.IsNullOrWhiteSpace(eventNameOverride) ? eventNameOverride : eventType.Name,
             FullTypeName = eventType.FullName ?? eventType.Name,
             Namespace = eventType.Namespace ?? string.Empty,
-            TopicName = fullTopicName,
+            Topic = topicName,
+            FullyQualifiedTopicName = fullTopicName,
             Domain = eventDomain,
             Version = version,
             IsInternal = isInternal,
@@ -132,7 +138,7 @@ private static T GetEventTopicAttribute<T>(Type type, string attributeNamePrefix
     }
 
     private static (List<EventPropertyMetadata> properties, List<PartitionKeyMetadata> partitionKeys) GetEventPropertiesAndPartitionKeys(
-        Type eventType, XmlDocumentationParser? xmlParser, PayloadSizeCalculator calculator)
+        Type eventType, XmlDocumentationParser? xmlParser, PayloadSizeCalculator calculator, string partitionKeyAttributeNamePrefix)
     {
         var properties = new List<EventPropertyMetadata>();
         var partitionKeys = new List<PartitionKeyMetadata>();
@@ -149,17 +155,21 @@ private static (List<EventPropertyMetadata> properties, List<PartitionKeyMetadat
             var isComplexType = !TypeUtils.IsPrimitiveType(property.PropertyType);
             var isRequired = TypeUtils.IsRequiredProperty(property);
 
-            // Check for PartitionKey attribute on the property
-            var partitionKeyAttr = property.GetCustomAttribute<PartitionKeyAttribute>();
+            // Check for the partition key attribute by name (generic, works across assembly load contexts)
+            var partitionKeyAttr = FindAttributeByName(property.GetCustomAttributes(), partitionKeyAttributeNamePrefix);
             var isPartitionKey = partitionKeyAttr != null;
 
             // If not found on property, check corresponding constructor parameter for records
             if (!isPartitionKey && parameterToPropertyMap.TryGetValue(property.Name, out var parameter))
             {
-                partitionKeyAttr = parameter.GetCustomAttribute<PartitionKeyAttribute>();
+                partitionKeyAttr = FindAttributeByName(parameter.GetCustomAttributes(), partitionKeyAttributeNamePrefix);
                 isPartitionKey = partitionKeyAttr != null;
             }
 
+            var partitionKeyOrder = partitionKeyAttr is null
+                ? (int?)null
+                : GetPropertyValue<int?>(partitionKeyAttr.GetType(), partitionKeyAttr, "Order") ?? 0;
+
             var description = eventDoc?.PropertyDescriptions?.GetValueOrDefault(property.Name) ?? "No description available";
             var sizeResult = calculator.CalculatePropertySize(property, property.PropertyType);
 
@@ -171,7 +181,7 @@ private static (List<EventPropertyMetadata> properties, List<PartitionKeyMetadat
                 IsRequired = isRequired,
                 IsComplexType = isComplexType,
                 IsPartitionKey = isPartitionKey,
-                PartitionKeyOrder = partitionKeyAttr?.Order,
+                PartitionKeyOrder = partitionKeyOrder,
                 Description = description,
                 EstimatedSizeBytes = sizeResult.SizeBytes,
                 IsAccurate = sizeResult.IsAccurate,
@@ -185,7 +195,7 @@ private static (List<EventPropertyMetadata> properties, List<PartitionKeyMetadat
                     Name = property.Name,
                     TypeName = TypeUtils.GetFriendlyTypeName(property.PropertyType),
                     Description = description,
-                    Order = partitionKeyAttr!.Order,
+                    Order = partitionKeyOrder ?? 0,
                     IsFromParameter = parameterToPropertyMap.ContainsKey(property.Name)
                 });
             }
@@ -262,8 +272,8 @@ private static string ConvertToKebabCase(string input)
     /// <summary>
     ///     Extracts properties from EventTopicAttribute using reflection for cross-assembly compatibility.
     /// </summary>
-    private static (bool shouldPluralize, string? domain, bool isInternal, string version) GetTopicAttributeProperties(
-        object topicAttribute)
+    private static (bool shouldPluralize, string? domain, bool isInternal, string version, string? eventName)
+        GetTopicAttributeProperties(object topicAttribute)
     {
         var attrType = topicAttribute.GetType();
 
@@ -271,10 +281,18 @@ private static (bool shouldPluralize, string? domain, bool isInternal, string ve
         var domain = GetPropertyValue<string?>(attrType, topicAttribute, "Domain");
         var isInternal = GetPropertyValue<bool?>(attrType, topicAttribute, "Internal") ?? false;
         var version = GetPropertyValue<string?>(attrType, topicAttribute, "Version") ?? "v1";
+        var eventName = GetPropertyValue<string?>(attrType, topicAttribute, "EventName");
 
-        return (shouldPluralize, domain, isInternal, version);
+        return (shouldPluralize, domain, isInternal, version, eventName);
     }
 
+    /// <summary>
+    ///     Finds a custom attribute by name (or name prefix) so discovery works across assembly load contexts
+    ///     and for any attribute type matching the configured convention, not just a hardcoded compiled type.
+    /// </summary>
+    private static Attribute? FindAttributeByName(IEnumerable<Attribute> attributes, string attributeNamePrefix) =>
+        attributes.FirstOrDefault(attr => attr.GetType().Name.StartsWith(attributeNamePrefix));
+
     /// <summary>
     ///     Gets a property value from an object using reflection with safe null handling.
     /// </summary>
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/EventViewModelFactory.cs b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/EventViewModelFactory.cs
index a2a6f5c0..d756406d 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/EventViewModelFactory.cs
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Services/EventViewModelFactory.cs
@@ -2,6 +2,7 @@
 
 using Momentum.Extensions.Abstractions.Extensions;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using Momentum.Extensions.EventMarkdownGenerator.Models;
 using Momentum.Extensions.EventMarkdownGenerator.Templates.Models;
 
@@ -11,7 +12,7 @@ namespace Momentum.Extensions.EventMarkdownGenerator.Services;
 ///     Factory for creating view models used in Liquid template rendering.
 ///     Extracts complex object creation logic from FluidMarkdownGenerator.
 /// </summary>
-public static class EventViewModelFactory
+public static partial class EventViewModelFactory
 {
     /// <summary>
     ///     Creates an event view model for template rendering.
@@ -27,7 +28,8 @@ public static EventViewModel CreateEventModel(EventMetadata metadata, EventDocum
             EventName = metadata.EventName,
             FullTypeName = metadata.FullTypeName,
             Namespace = metadata.Namespace,
-            TopicName = metadata.TopicName,
+            Topic = metadata.Topic,
+            FullyQualifiedTopicName = metadata.FullyQualifiedTopicName,
             Version = metadata.Version,
             Status = metadata.GetStatus(),
             Entity = ExtractEntityFromEventType(metadata.EventType),
@@ -167,7 +169,9 @@ private static string GetPropertyDescription(EventPropertyMetadata property)
             description += " (partition key)";
         }
 
-        return description;
+        // Descriptions are rendered inline in a markdown table cell, so multi-line XML doc summaries
+        // must be flattened to a single line (collapsing newlines and their surrounding whitespace).
+        return CollapseWhitespace(description);
     }
 
     private static string GetPropertyDescription(PropertyInfo property) => $"Gets or sets the {property.Name.ToLowerInvariant()}.";
@@ -200,9 +204,15 @@ private static string GetPropertyDescription(EventPropertyMetadata property)
 
     private static string GetPartitionKeyDescription(PartitionKeyMetadata partitionKey)
     {
-        return partitionKey.Description ?? "Used for message routing";
+        return CollapseWhitespace(partitionKey.Description ?? "Used for message routing");
     }
 
+    [GeneratedRegex(@"\s+")]
+    private static partial Regex WhitespaceRegex();
+
+    /// <summary>Collapses any run of whitespace (including newlines) into a single space for inline rendering.</summary>
+    private static string CollapseWhitespace(string value) => WhitespaceRegex().Replace(value, " ").Trim();
+
     private static string GetTypeDescription(Type type)
     {
         var typeName = type.Name.ToLowerInvariant();
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/Models/EventViewModel.cs b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/Models/EventViewModel.cs
index 56bfa1da..fd60c4eb 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/Models/EventViewModel.cs
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/Models/EventViewModel.cs
@@ -7,7 +7,8 @@ public class EventViewModel
     public string EventName { get; set; } = string.Empty;
     public string FullTypeName { get; set; } = string.Empty;
     public string Namespace { get; set; } = string.Empty;
-    public string TopicName { get; set; } = string.Empty;
+    public string Topic { get; set; } = string.Empty;
+    public string FullyQualifiedTopicName { get; set; } = string.Empty;
     public string Version { get; set; } = string.Empty;
     public string Status { get; set; } = string.Empty;
     public string Entity { get; set; } = string.Empty;
diff --git a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/event.liquid b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/event.liquid
index a9b42712..28f1198e 100644
--- a/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/event.liquid
+++ b/libs/Momentum/src/Momentum.Extensions.EventMarkdownGenerator/Templates/event.liquid
@@ -18,7 +18,8 @@ editLink: false
 - **Entity:** `{{ event.Entity | downcase }}`
 {% endif -%}
 - **Type:** {% if event.IsInternal %}Domain Event{% else %}Integration Event{% endif %}
-- **Topic:** `{{ event.TopicName }}`
+- **Topic:** `{{ event.Topic }}`
+- **Fully Qualified Topic:** `{{ event.FullyQualifiedTopicName }}`
 - **Estimated Payload Size:** {{ event.TotalEstimatedSizeBytes }} bytes{% if event.HasInaccurateEstimates %} ⚠️ *Contains dynamic properties*{% endif %}
 {% if event.PartitionKeys.size > 0 -%}
 - **Partition Keys**: {{ event.PartitionKeys | map: "Name" | join: ", " }}
@@ -42,7 +43,7 @@ editLink: false
 | Property | Type | Required | Size | Description |
 | ----------------------------------------------------------------- | --------- | -------- | -------- | --------------------------------------------------------------------- |
 {% for property in event.Properties -%}
-    | {% if property.IsComplexType and property.SchemaLink -%}[{{ property.Name }}](/events/schemas/{{ property.SchemaLink }}){% else -%}{{ property.Name }}{% endif %}| `{{ property.TypeName }}` | {% if property.IsRequired -%}✓{% else %} {% endif %}| {{ property.EstimatedSizeDisplay }} | {{ property.Description }} |
+    | {% if property.IsComplexType and property.SchemaLink -%}[{{ property.Name }}](/events/schemas/{{ property.SchemaLink }}){% else -%}{{ property.Name }}{% endif %}| `{{ property.TypeName }}` | {% if property.IsRequired -%}✓{% else %} {% endif %}| {{ property.EstimatedSizeDisplay }} | {{ property.Description | strip_newlines }} |
 {% endfor %}
 
 {% if event.PartitionKeys.size > 0 -%}
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/FluidMarkdownGeneratorTests.cs b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/FluidMarkdownGeneratorTests.cs
index f04768c1..2c19da76 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/FluidMarkdownGeneratorTests.cs
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/FluidMarkdownGeneratorTests.cs
@@ -31,7 +31,8 @@ private static EventWithDocumentation CreateTestEventWithDocumentation()
                 EventName = "TestEvent",
                 FullTypeName = eventType.FullName!,
                 Namespace = eventType.Namespace!,
-                TopicName = "{env}.test.public.tests.v1",
+                Topic = "tests",
+                FullyQualifiedTopicName = "{env}.test.public.tests.v1",
                 Domain = "Tests",
                 Version = "v1",
                 IsInternal = false,
@@ -157,6 +158,66 @@ public async Task GenerateMarkdown_ShouldContainEventMetadata()
         }
     }
 
+    [Fact]
+    public async Task GenerateMarkdown_ShouldExposeTopicAndFullyQualifiedTopicSeparately()
+    {
+        var generator = await FluidMarkdownGenerator.CreateAsync();
+        var eventWithDoc = CreateTestEventWithDocumentation();
+        var outputDir = CreateTempDirectory();
+
+        try
+        {
+            var result = generator.GenerateMarkdown(eventWithDoc, outputDir);
+
+            result.Content.ShouldContain("**Topic:** `Tests`");
+            result.Content.ShouldContain("**Fully Qualified Topic:** `{env}.test.public.tests.v1`");
+        }
+        finally
+        {
+            Directory.Delete(outputDir, true);
+        }
+    }
+
+    [Fact]
+    public async Task GenerateMarkdown_WithMultiLinePropertyDescription_ShouldKeepDescriptionOnSingleTableRow()
+    {
+        var generator = await FluidMarkdownGenerator.CreateAsync();
+        var eventWithDoc = CreateTestEventWithDocumentation();
+
+        // Simulate a property whose XML doc summary wraps onto multiple lines. The XML parser trims each
+        // line's indentation and joins with '\n', so the raw description contains bare newlines between words.
+        eventWithDoc.Metadata.Properties[1] = eventWithDoc.Metadata.Properties[1] with
+        {
+            Description = "Partitions the Event Hub by reservation so that all events\nare delivered in publication order (per-key FIFO)."
+        };
+
+        var outputDir = CreateTempDirectory();
+
+        try
+        {
+            var result = generator.GenerateMarkdown(eventWithDoc, outputDir);
+
+            // The payload table row for the property must not be split by an embedded newline:
+            // the whole description, including its tail, must stay inside the row's last cell,
+            // and the wrapped words must be joined by a single space (not glued together).
+            var tableRow = result.Content.Split('\n')
+                .FirstOrDefault(line => line.TrimStart().StartsWith("| Name"));
+
+            tableRow.ShouldNotBeNull();
+            tableRow.ShouldContain("all events are delivered in publication order (per-key FIFO).");
+            tableRow.ShouldNotContain("eventsare");
+            tableRow.TrimEnd().ShouldEndWith("|");
+
+            // The tail must not spill out as an orphaned line below the table.
+            result.Content.Split('\n')
+                .ShouldNotContain(line => line.TrimStart().StartsWith("are delivered in publication order"));
+        }
+        finally
+        {
+            Directory.Delete(outputDir, true);
+        }
+    }
+
     [Fact]
     public async Task GenerateAllMarkdown_ShouldReturnOutputsForAllEvents()
     {
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/GenericAttributeDiscoveryTests.cs b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/GenericAttributeDiscoveryTests.cs
new file mode 100644
index 00000000..51cec03c
--- /dev/null
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/GenericAttributeDiscoveryTests.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Momentum .NET. All rights reserved.
+
+using Momentum.Extensions.EventMarkdownGenerator.Services;
+using Shouldly;
+using System.Reflection;
+using Xunit;
+
+namespace Momentum.Extensions.EventMarkdownGenerator.Tests;
+
+/// <summary>
+///     Verifies that event, partition-key, and event-name discovery all resolve attributes by name
+///     (configurable convention) rather than by a hardcoded compiled attribute type.
+/// </summary>
+public class GenericAttributeDiscoveryTests
+{
+    // Custom, non-Momentum attribute types that only match by naming convention.
+    // Members are read via reflection by the generator, so they are public to avoid unused-private warnings.
+    [AttributeUsage(AttributeTargets.Class)]
+    public sealed class ConventionEventTopicAttribute : Attribute
+    {
+        public string? Domain { get; init; }
+        public string Version { get; init; } = "v1";
+        public bool Internal { get; init; }
+        public string? Topic { get; init; }
+        public string? EventName { get; init; }
+    }
+
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter)]
+    public sealed class ConventionPartitionKeyAttribute : Attribute
+    {
+        public int Order { get; init; }
+    }
+
+    [ConventionEventTopic(Domain = "reservations", Topic = "reservation-created", EventName = "ReservationBooked")]
+    public record ConventionEvent(
+        [property: ConventionPartitionKey(Order = 1)] Guid ReservationId,
+        [property: ConventionPartitionKey(Order = 0)] Guid TenantId,
+        string Notes);
+
+    [Fact]
+    public void DiscoverEvents_WithCustomAttributeNames_DiscoversPartitionKeysAndEventNameOverride()
+    {
+        var assembly = Assembly.GetExecutingAssembly();
+
+        var events = AssemblyEventDiscovery.DiscoverEvents(
+            assembly,
+            xmlParser: null,
+            PayloadSizeCalculator.Create("json"),
+            attributeNamePrefix: nameof(ConventionEventTopicAttribute),
+            partitionKeyAttributeNamePrefix: nameof(ConventionPartitionKeyAttribute)).ToList();
+
+        var conventionEvent = events.ShouldHaveSingleItem();
+
+        // Ask #4: EventName override read from the attribute instead of the CLR type name.
+        conventionEvent.EventName.ShouldBe("ReservationBooked");
+
+        // Ask #3: Topic exposes the plain topic/hub name; the fully-qualified name keeps the composed convention.
+        conventionEvent.Topic.ShouldBe("reservation-created");
+        conventionEvent.FullyQualifiedTopicName.ShouldBe("{env}.momentum.public.reservation-created.v1");
+
+        // Ask #2: partition keys discovered via the custom attribute, ordered by Order.
+        conventionEvent.PartitionKeys.Count.ShouldBe(2);
+        conventionEvent.PartitionKeys[0].Name.ShouldBe("TenantId");
+        conventionEvent.PartitionKeys[0].Order.ShouldBe(0);
+        conventionEvent.PartitionKeys[1].Name.ShouldBe("ReservationId");
+        conventionEvent.PartitionKeys[1].Order.ShouldBe(1);
+    }
+}
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Cashiers.Contracts.IntegrationEvents.CashierCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Cashiers.Contracts.IntegrationEvents.CashierCreated.md
index a8cdcf6c..dfd7e078 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Cashiers.Contracts.IntegrationEvents.CashierCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Cashiers.Contracts.IntegrationEvents.CashierCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `cashier`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.cashiers.v1`
+- **Topic:** `cashiers`
+- **Fully Qualified Topic:** `{env}.testevents.public.cashiers.v1`
 - **Estimated Payload Size:** 73 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId, PartitionKeyTest
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md
index ae7ac59a..3236107d 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `bulk-data-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.bulk-data-processeds.v1`
+- **Topic:** `bulk-data-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.bulk-data-processeds.v1`
 - **Estimated Payload Size:** 399 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md
index 8a9e39d4..3c1897f8 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `audit-log`
 - **Type:** Domain Event
-- **Topic:** `{env}.testevents.internal.audit-logs.v1`
+- **Topic:** `audit-logs`
+- **Fully Qualified Topic:** `{env}.testevents.internal.audit-logs.v1`
 - **Estimated Payload Size:** 24 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md
index 551b8522..05fc7c42 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `product`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.products.v1`
+- **Topic:** `products`
+- **Fully Qualified Topic:** `{env}.testevents.public.products.v1`
 - **Estimated Payload Size:** 64 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId, WarehouseId, ProductCategory
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
index 28f33877..1d299704 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
@@ -14,7 +14,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-processeds.v1`
+- **Topic:** `payment-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-processeds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md
index 50bf61df..dbb37a9c 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `order`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.orders.v1`
+- **Topic:** `orders`
+- **Fully Qualified Topic:** `{env}.testevents.public.orders.v1`
 - **Estimated Payload Size:** 1388 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md
index 0d267af1..35025ea6 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-status-changed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-status-changeds.v1`
+- **Topic:** `payment-status-changeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-status-changeds.v1`
 - **Estimated Payload Size:** 56 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md
index ac2db010..7f0ec25b 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `external-payment-gateway-response-received`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.external-payment-gateway-response-receiveds.v1`
+- **Topic:** `external-payment-gateway-response-receiveds`
+- **Fully Qualified Topic:** `{env}.testevents.public.external-payment-gateway-response-receiveds.v1`
 - **Estimated Payload Size:** 55 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md
index 711c7d30..2a24a08c 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `minimal-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.minimal-events.v1`
+- **Topic:** `minimal-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.minimal-events.v1`
 - **Estimated Payload Size:** 16 bytes
 - **Partition Keys**: Id
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md
index f8b44e32..4e1cb5c7 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `simple-notification`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.simple-notifications.v1`
+- **Topic:** `simple-notifications`
+- **Fully Qualified Topic:** `{env}.testevents.public.simple-notifications.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 
 ## Description
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md
index 18382dd6..5ac9ea04 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `node-relationship-created`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.node-relationship-createds.v1`
+- **Topic:** `node-relationship-createds`
+- **Fully Qualified Topic:** `{env}.testevents.public.node-relationship-createds.v1`
 - **Estimated Payload Size:** 382 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md
index 8bb8efb5..3b5f6d61 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `empty-summary-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.empty-summary-events.v1`
+- **Topic:** `empty-summary-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.empty-summary-events.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md
index c160fe8d..02c70d45 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `malformed-xml-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.malformed-xml-events.v1`
+- **Topic:** `malformed-xml-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.malformed-xml-events.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md
index 7abd28bd..23cd6ad6 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `missing-param-docs-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.missing-param-docs-events.v1`
+- **Topic:** `missing-param-docs-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.missing-param-docs-events.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md
index 0e74361d..e30e089f 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `missing`
 - **Type:** Domain Event
-- **Topic:** `{env}.testevents.internal.missings.v1`
+- **Topic:** `missings`
+- **Fully Qualified Topic:** `{env}.testevents.internal.missings.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md
index 5e7940e5..d9bf5f20 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `invoice-generated`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.invoice-generateds.v1`
+- **Topic:** `invoice-generateds`
+- **Fully Qualified Topic:** `{env}.testevents.public.invoice-generateds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
index 0067b9df..72487e2b 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-processeds.v1`
+- **Topic:** `payment-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-processeds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md
index 838a5c78..a38f73f0 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `subscription-activated`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.subscription-activateds.v1`
+- **Topic:** `subscription-activateds`
+- **Fully Qualified Topic:** `{env}.testevents.public.subscription-activateds.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionCancelled.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionCancelled.md
index dd1eeea1..21015061 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionCancelled.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionCancelled.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `subscription-cancelled`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.subscription-cancelleds.v1`
+- **Topic:** `subscription-cancelleds`
+- **Fully Qualified Topic:** `{env}.testevents.public.subscription-cancelleds.v1`
 - **Estimated Payload Size:** 24 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md
index 90450509..7ebf58e0 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `user-created`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.user-createds.v1`
+- **Topic:** `user-createds`
+- **Fully Qualified Topic:** `{env}.testevents.public.user-createds.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserDeleted.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserDeleted.md
index fef7f955..728101a9 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserDeleted.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/basic-event/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserDeleted.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `user-deleted`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.user-deleteds.v1`
+- **Topic:** `user-deleteds`
+- **Fully Qualified Topic:** `{env}.testevents.public.user-deleteds.v1`
 - **Estimated Payload Size:** 24 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/circular-references/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/circular-references/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md
index 18382dd6..5ac9ea04 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/circular-references/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/circular-references/expected/TestEvents.Graph.Nodes.Contracts.IntegrationEvents.NodeRelationshipCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `node-relationship-created`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.node-relationship-createds.v1`
+- **Topic:** `node-relationship-createds`
+- **Fully Qualified Topic:** `{env}.testevents.public.node-relationship-createds.v1`
 - **Estimated Payload Size:** 382 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/collection-types/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/collection-types/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md
index ae7ac59a..3236107d 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/collection-types/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/collection-types/expected/TestEvents.AppDomain.Collections.Contracts.IntegrationEvents.BulkDataProcessed.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `bulk-data-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.bulk-data-processeds.v1`
+- **Topic:** `bulk-data-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.bulk-data-processeds.v1`
 - **Estimated Payload Size:** 399 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/complex-event-with-schemas/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/complex-event-with-schemas/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md
index 50bf61df..dbb37a9c 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/complex-event-with-schemas/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/complex-event-with-schemas/expected/TestEvents.AppDomain.Orders.Contracts.IntegrationEvents.OrderCompleted.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `order`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.orders.v1`
+- **Topic:** `orders`
+- **Fully Qualified Topic:** `{env}.testevents.public.orders.v1`
 - **Estimated Payload Size:** 1388 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/internal-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/internal-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md
index 8a9e39d4..3c1897f8 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/internal-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/internal-event/expected/TestEvents.AppDomain.Internal.Audit.IntegrationEvents.InternalAuditLogCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `audit-log`
 - **Type:** Domain Event
-- **Topic:** `{env}.testevents.internal.audit-logs.v1`
+- **Topic:** `audit-logs`
+- **Fully Qualified Topic:** `{env}.testevents.internal.audit-logs.v1`
 - **Estimated Payload Size:** 24 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md
index 711c7d30..2a24a08c 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.MinimalEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `minimal-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.minimal-events.v1`
+- **Topic:** `minimal-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.minimal-events.v1`
 - **Estimated Payload Size:** 16 bytes
 - **Partition Keys**: Id
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md
index f8b44e32..4e1cb5c7 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/minimal-documentation/expected/TestEvents.Events.Core.IntegrationEvents.SimpleNotification.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `simple-notification`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.simple-notifications.v1`
+- **Topic:** `simple-notifications`
+- **Fully Qualified Topic:** `{env}.testevents.public.simple-notifications.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 
 ## Description
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md
index 8bb8efb5..3b5f6d61 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.EmptySummaryEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `empty-summary-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.empty-summary-events.v1`
+- **Topic:** `empty-summary-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.empty-summary-events.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md
index c160fe8d..02c70d45 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MalformedXmlEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `malformed-xml-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.malformed-xml-events.v1`
+- **Topic:** `malformed-xml-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.malformed-xml-events.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md
index 7abd28bd..23cd6ad6 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.MissingParamDocsEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `missing-param-docs-event`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.missing-param-docs-events.v1`
+- **Topic:** `missing-param-docs-events`
+- **Fully Qualified Topic:** `{env}.testevents.public.missing-param-docs-events.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md
index 0e74361d..e30e089f 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/missing-documentation/expected/TestEvents.Missing.Docs.IntegrationEvents.UndocumentedEvent.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `missing`
 - **Type:** Domain Event
-- **Topic:** `{env}.testevents.internal.missings.v1`
+- **Topic:** `missings`
+- **Fully Qualified Topic:** `{env}.testevents.internal.missings.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
index 28f33877..1d299704 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
@@ -14,7 +14,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-processeds.v1`
+- **Topic:** `payment-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-processeds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md
index 5e7940e5..d9bf5f20 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Invoices.Contracts.IntegrationEvents.InvoiceGenerated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `invoice-generated`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.invoice-generateds.v1`
+- **Topic:** `invoice-generateds`
+- **Fully Qualified Topic:** `{env}.testevents.public.invoice-generateds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
index 0067b9df..72487e2b 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-processeds.v1`
+- **Topic:** `payment-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-processeds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md
index 838a5c78..a38f73f0 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Subscriptions.Contracts.IntegrationEvents.SubscriptionActivated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `subscription-activated`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.subscription-activateds.v1`
+- **Topic:** `subscription-activateds`
+- **Fully Qualified Topic:** `{env}.testevents.public.subscription-activateds.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md
index 90450509..7ebf58e0 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-events-sidebar/expected/TestEvents.Platform.Users.Contracts.IntegrationEvents.UserCreated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `user-created`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.user-createds.v1`
+- **Topic:** `user-createds`
+- **Fully Qualified Topic:** `{env}.testevents.public.user-createds.v1`
 - **Estimated Payload Size:** 16 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-partition-keys/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-partition-keys/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md
index 551b8522..05fc7c42 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-partition-keys/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/multiple-partition-keys/expected/TestEvents.AppDomain.Inventory.Contracts.IntegrationEvents.ProductStockUpdated.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `product`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.products.v1`
+- **Topic:** `products`
+- **Fully Qualified Topic:** `{env}.testevents.public.products.v1`
 - **Estimated Payload Size:** 64 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId, WarehouseId, ProductCategory
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nested-namespaces/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nested-namespaces/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md
index ac2db010..7f0ec25b 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nested-namespaces/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nested-namespaces/expected/TestEvents.Enterprise.AppDomain.Payments.Gateway.External.Contracts.IntegrationEvents.ExternalPaymentGatewayResponseReceived.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `external-payment-gateway-response-received`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.external-payment-gateway-response-receiveds.v1`
+- **Topic:** `external-payment-gateway-response-receiveds`
+- **Fully Qualified Topic:** `{env}.testevents.public.external-payment-gateway-response-receiveds.v1`
 - **Estimated Payload Size:** 55 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nullable-and-enums/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nullable-and-enums/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md
index 0d267af1..35025ea6 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nullable-and-enums/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/nullable-and-enums/expected/TestEvents.AppDomain.Types.Contracts.IntegrationEvents.PaymentStatusChanged.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-status-changed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-status-changeds.v1`
+- **Topic:** `payment-status-changeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-status-changeds.v1`
 - **Estimated Payload Size:** 56 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
index 28f33877..1d299704 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.AppDomain.Legacy.Contracts.IntegrationEvents.PaymentProcessed.md
@@ -14,7 +14,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-processeds.v1`
+- **Topic:** `payment-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-processeds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
index 0067b9df..72487e2b 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTestScenarios/obsolete-event/expected/TestEvents.Platform.AppDomain.Payments.Contracts.IntegrationEvents.PaymentProcessed.md
@@ -11,7 +11,8 @@ editLink: false
 - **Version:** v1
 - **Entity:** `payment-processed`
 - **Type:** Integration Event
-- **Topic:** `{env}.testevents.public.payment-processeds.v1`
+- **Topic:** `payment-processeds`
+- **Fully Qualified Topic:** `{env}.testevents.public.payment-processeds.v1`
 - **Estimated Payload Size:** 32 bytes ⚠️ *Contains dynamic properties*
 - **Partition Keys**: TenantId
 
diff --git a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTests.cs b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTests.cs
index 686d6281..f351e652 100644
--- a/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTests.cs
+++ b/libs/Momentum/tests/Momentum.Extensions.EventMarkdownGenerator.Tests/IntegrationTests.cs
@@ -253,7 +253,8 @@ private static void ValidateGeneratedContent(string content)
         content.ShouldContain("---\neditLink: false\n---");
 
         // Validate topic format
-        content.ShouldContain("**Topic:** `{env}.testevents.public.cashiers.v1`");
+        content.ShouldContain("**Topic:** `Cashiers`");
+        content.ShouldContain("**Fully Qualified Topic:** `{env}.testevents.public.cashiers.v1`");
 
         // Validate entity field
         content.ShouldContain("**Entity:** `cashier`");
diff --git a/scripts/check-changelog-before-pr.sh b/scripts/check-changelog-before-pr.sh
new file mode 100755
index 00000000..5cf981d4
--- /dev/null
+++ b/scripts/check-changelog-before-pr.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# PreToolUse hook: block `gh pr create` unless CHANGELOG.md was updated on this branch.
+#
+# Claude Code passes the Bash tool's command in $TOOL_INPUT_COMMAND. If the command
+# creates a pull request and CHANGELOG.md has not been touched (committed on the branch
+# or pending in the working tree), the hook exits non-zero to stop the PR from being created.
+
+set -euo pipefail
+
+cmd="${TOOL_INPUT_COMMAND:-}"
+
+# Only act on pull-request creation.
+if ! printf '%s' "$cmd" | grep -qE 'gh[[:space:]]+pr[[:space:]]+create'; then
+    exit 0
+fi
+
+repo_root="$(git rev-parse --show-toplevel 2>/dev/null || echo .)"
+cd "$repo_root"
+
+# Determine the base branch (default to 'main').
+base="main"
+git show-ref --verify --quiet "refs/heads/$base" || base="$(git symbolic-ref --quiet --short HEAD || echo main)"
+
+changed=false
+
+# Committed on this branch since it diverged from base.
+if git diff --name-only "$base...HEAD" 2>/dev/null | grep -qx 'CHANGELOG.md'; then
+    changed=true
+fi
+
+# Pending (staged or unstaged) changes to the changelog.
+if git status --porcelain -- CHANGELOG.md 2>/dev/null | grep -q .; then
+    changed=true
+fi
+
+if [ "$changed" = "true" ]; then
+    exit 0
+fi
+
+echo 'BLOCK: CHANGELOG.md was not updated on this branch. Add an entry under a [YYYY-MM-DD] date heading before creating the PR.' >&2
+exit 2
diff --git a/src/AppDomain.Api/AppDomain.Api.csproj b/src/AppDomain.Api/AppDomain.Api.csproj
index fc8bdc33..a90c3bc4 100644
--- a/src/AppDomain.Api/AppDomain.Api.csproj
+++ b/src/AppDomain.Api/AppDomain.Api.csproj
@@ -22,6 +22,9 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <!--#if (!LIBS_INCLUDES_DEFAULTS) -->
+        <!--#if (INCLUDE_ORLEANS) -->
+        <PackageReference Include="Microsoft.Orleans.Analyzers" VersionOverride="10.2.1" />
+        <!--#endif -->
         <PackageReference Include="Momentum.ServiceDefaults"/>
         <!--#endif -->
         <!--#if (!LIBS_INCLUDES_API) -->
diff --git a/src/AppDomain/AppDomain.csproj b/src/AppDomain/AppDomain.csproj
index c374e5fe..14623f90 100644
--- a/src/AppDomain/AppDomain.csproj
+++ b/src/AppDomain/AppDomain.csproj
@@ -30,6 +30,9 @@
         <!--#else
     <ItemGroup>
         #endif -->
+        <!--#if (INCLUDE_ORLEANS) -->
+        <PackageReference Include="Microsoft.Orleans.Analyzers" VersionOverride="10.2.1" />
+        <!--#endif -->
         <PackageReference Include="Momentum.Extensions.Abstractions"/>
         <!--#if (!LIBS_INCLUDES_EXT) -->
         <PackageReference Include="Momentum.Extensions"/>
diff --git a/tests/AppDomain.Tests.E2E/OpenApi/Generated/AppDomainApiClient.cs b/tests/AppDomain.Tests.E2E/OpenApi/Generated/AppDomainApiClient.cs
index d2b79c4a..a16476d3 100644
--- a/tests/AppDomain.Tests.E2E/OpenApi/Generated/AppDomainApiClient.cs
+++ b/tests/AppDomain.Tests.E2E/OpenApi/Generated/AppDomainApiClient.cs
@@ -14,7 +14,7 @@
 namespace AppDomain.Tests.E2E.OpenApi.Generated
 {
     /// <summary>AppDomain.Api | v1</summary>
-    [System.CodeDom.Compiler.GeneratedCode("Refitter", "1.7.3.0")]
+    [System.CodeDom.Compiler.GeneratedCode("Refitter", "2.0.0.0")]
     public partial interface IAppDomainApiClient
     {
         /// <summary>Retrieves a specific cashier by their unique identifier</summary>
@@ -294,7 +294,7 @@ public partial interface IAppDomainApiClient
 
 //----------------------
 // <auto-generated>
-//     Generated using the NSwag toolchain v14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
+//     Generated using the NSwag toolchain v14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
 // </auto-generated>
 //----------------------
 
@@ -320,7 +320,7 @@ namespace AppDomain.Tests.E2E.OpenApi.Generated
 
     
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class CancelInvoiceRequest
     {
 
@@ -340,7 +340,7 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class Cashier
     {
 
@@ -382,7 +382,7 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class CashierPayment
     {
 
@@ -409,7 +409,7 @@ public IDictionary<string, object> AdditionalProperties
     /// <summary>
     /// Request to create a new cashier.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class CreateCashierRequest
     {
 
@@ -441,7 +441,7 @@ public IDictionary<string, object> AdditionalProperties
     /// <summary>
     /// Request to create a new invoice in the system.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class CreateInvoiceRequest
     {
 
@@ -489,7 +489,7 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class HttpValidationProblemDetails
     {
 
@@ -523,7 +523,7 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class Invoice
     {
 
@@ -587,7 +587,8 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public enum InvoiceStatus
     {
 
@@ -605,7 +606,7 @@ public enum InvoiceStatus
     /// <summary>
     /// Request to mark an invoice as paid with payment details.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class MarkInvoiceAsPaidRequest
     {
 
@@ -642,7 +643,7 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class ProblemDetails
     {
 
@@ -673,7 +674,7 @@ public IDictionary<string, object> AdditionalProperties
 
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class Result
     {
 
@@ -720,7 +721,7 @@ public IDictionary<string, object> AdditionalProperties
     /// <summary>
     /// Request to simulate a payment for testing purposes.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class SimulatePaymentRequest
     {
 
@@ -772,7 +773,7 @@ public IDictionary<string, object> AdditionalProperties
     /// <summary>
     /// Request to update an existing cashier.
     /// </summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")]
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.7.1.0 (NJsonSchema v11.6.1.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class UpdateCashierRequest
     {