From 81beaeff2f76d56bbd2b27aebfe44745dadc7e76 Mon Sep 17 00:00:00 2001
From: Scott Beddall <scbedd@microsoft.com>
Date: Tue, 5 Aug 2025 22:16:32 +0000
Subject: [PATCH 01/34] cutover PR

---
 .../src/summarize-checks/summarize-checks.js  | 52 ++++++++++---------
 .github/workflows/summarize-checks.yaml       | 10 ++--
 .github/workflows/summarize-impact.yaml       |  4 +-
 .../swagger-modelvalidation-code.yaml         |  4 +-
 .../swagger-modelvalidation-status.yaml       |  8 +--
 .../swagger-semanticvalidation-code.yaml      |  4 +-
 .../swagger-semanticvalidation-status.yaml    |  8 +--
 .../fixtures/RawGraphQLResponse.json          |  4 +-
 .../summarize-checks/summarize-checks.test.js | 22 ++++----
 .../watch-breakingchange-crossversion.yaml    |  2 +-
 .github/workflows/watch-breakingchange.yaml   |  2 +-
 .github/workflows/watch-modelvalidation.yaml  |  2 +-
 .../workflows/watch-semanticvalidation.yaml   |  2 +-
 13 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/src/summarize-checks/summarize-checks.js b/.github/workflows/src/summarize-checks/summarize-checks.js
index 7678f5d5b011..670924b3fb56 100644
--- a/.github/workflows/src/summarize-checks/summarize-checks.js
+++ b/.github/workflows/src/summarize-checks/summarize-checks.js
@@ -19,11 +19,11 @@
 */
 
 // #region imports/constants
-import { extractInputs } from "../context.js";
-// import { commentOrUpdate } from "../comment.js";
 import { execFile } from "../../../shared/src/exec.js";
 import { CheckConclusion, PER_PAGE_MAX } from "../../../shared/src/github.js";
 import { intersect } from "../../../shared/src/set.js";
+import { commentOrUpdate } from "../comment.js";
+import { extractInputs } from "../context.js";
 import {
   brChRevApproval,
   getViolatedRequiredLabelsRules,
@@ -140,7 +140,8 @@ const FYI_CHECK_NAMES = [
   "Swagger BreakingChange",
   "Swagger PrettierCheck",
 ];
-const AUTOMATED_CHECK_NAME = "[TEST-IGNORE] Automated merging requirements met";
+const AUTOMATED_CHECK_NAME = "Automated merging requirements met";
+const IMPACT_CHECK_NAME = "Summarize PR Impact";
 const NEXT_STEPS_COMMENT_ID = "NextStepsToMerge";
 
 /** @type {CheckMetadata[]} */
@@ -397,24 +398,24 @@ export async function summarizeChecksImpl(
 
   for (const label of labelContext.toRemove) {
     core.info(`Removing label: ${label} from ${owner}/${repo}#${issue_number}.`);
-    // await github.rest.issues.removeLabel({
-    //   owner: owner,
-    //   repo: repo,
-    //   issue_number: issue_number,
-    //   name: label,
-    // });
+    await github.rest.issues.removeLabel({
+      owner: owner,
+      repo: repo,
+      issue_number: issue_number,
+      name: label,
+    });
   }
 
   if (labelContext.toAdd.size > 0) {
     core.info(
       `Adding labels: ${Array.from(labelContext.toAdd).join(", ")} to ${owner}/${repo}#${issue_number}.`,
     );
-    // await github.rest.issues.addLabels({
-    //   owner: owner,
-    //   repo: repo,
-    //   issue_number: issue_number,
-    //   labels: Array.from(labelContext.toAdd),
-    // });
+    await github.rest.issues.addLabels({
+      owner: owner,
+      repo: repo,
+      issue_number: issue_number,
+      labels: Array.from(labelContext.toAdd),
+    });
   }
 
   // adjust labelNames based on labelsToAdd/labelsToRemove
@@ -441,20 +442,21 @@ export async function summarizeChecksImpl(
     `Updating comment '${NEXT_STEPS_COMMENT_ID}' on ${owner}/${repo}#${issue_number} with body: ${commentBody}`,
   );
   // this will remain commented until we're comfortable with the change.
-  // await commentOrUpdate(
-  //   { github, context, core },
-  //   owner,
-  //   repo,
-  //   issue_number,
-  //   commentName,
-  //   commentBody
-  // )
+  await commentOrUpdate(
+    github,
+    core,
+    owner,
+    repo,
+    issue_number,
+    commentBody,
+    NEXT_STEPS_COMMENT_ID,
+  );
 
   // finally, update the "Automated merging requirements met" commit status
   await updateCommitStatus(github, core, owner, repo, head_sha, automatedChecksMet);
 
   core.info(
-    `Summarize checks has identified that status of "[TEST-IGNORE] Automated merging requirements met" commit status should be updated to: ${JSON.stringify(automatedChecksMet)}.`,
+    `Summarize checks has identified that status of "${AUTOMATED_CHECK_NAME}" commit status should be updated to: ${JSON.stringify(automatedChecksMet)}.`,
   );
 }
 
@@ -831,7 +833,7 @@ export function extractRunsFromGraphQLResponse(response) {
         if (checkSuiteNode.checkRuns?.nodes) {
           checkSuiteNode.checkRuns.nodes.forEach((checkRunNode) => {
             if (
-              checkRunNode.name === "[TEST-IGNORE] Summarize PR Impact" &&
+              checkRunNode.name === IMPACT_CHECK_NAME &&
               checkRunNode.status?.toLowerCase() === "completed" &&
               checkRunNode.conclusion?.toLowerCase() === "success"
             ) {
diff --git a/.github/workflows/summarize-checks.yaml b/.github/workflows/summarize-checks.yaml
index a1d066b1df0d..8f644caa3813 100644
--- a/.github/workflows/summarize-checks.yaml
+++ b/.github/workflows/summarize-checks.yaml
@@ -1,11 +1,11 @@
-name: "[TEST-IGNORE] Summarize Checks"
+name: "Summarize Checks"
 
 on:
   workflow_run:
     workflows:
-      - "\\[TEST-IGNORE\\] Swagger SemanticValidation - Set Status"
-      - "\\[TEST-IGNORE\\] Swagger ModelValidation - Set Status"
-      - "\\[TEST-IGNORE\\] Summarize PR Impact"
+      - "Swagger SemanticValidation - Set Status"
+      - "Swagger ModelValidation - Set Status"
+      - "Summarize PR Impact"
       - "Swagger Avocado - Set Status"
       - "Swagger LintDiff - Set Status"
       - "SDK Validation Status"
@@ -30,7 +30,7 @@ permissions:
 jobs:
   run-summarize-checks:
     if: ${{ github.event_name == 'pull_request_target' || github.event.workflow_run.conclusion != 'skipped' }}
-    name: "[TEST-IGNORE] Summarize Checks"
+    name: "Summarize Checks"
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/summarize-impact.yaml b/.github/workflows/summarize-impact.yaml
index df9045055c50..4e82b60c78ee 100644
--- a/.github/workflows/summarize-impact.yaml
+++ b/.github/workflows/summarize-impact.yaml
@@ -1,4 +1,4 @@
-name: "[TEST-IGNORE] Summarize PR Impact"
+name: "Summarize PR Impact"
 
 on: pull_request
 
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   impact:
-    name: "[TEST-IGNORE] Summarize PR Impact"
+    name: "Summarize PR Impact"
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/swagger-modelvalidation-code.yaml b/.github/workflows/swagger-modelvalidation-code.yaml
index 9ab3b15471ee..8e5bba0c8b09 100644
--- a/.github/workflows/swagger-modelvalidation-code.yaml
+++ b/.github/workflows/swagger-modelvalidation-code.yaml
@@ -1,4 +1,4 @@
-name: "[TEST-IGNORE] Swagger ModelValidation - Analyze Code"
+name: "Swagger ModelValidation - Analyze Code"
 
 on: pull_request
 
@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   oav:
-    name: "[TEST-IGNORE] Swagger ModelValidation - Analyze Code"
+    name: "Swagger ModelValidation - Analyze Code"
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/swagger-modelvalidation-status.yaml b/.github/workflows/swagger-modelvalidation-status.yaml
index 7310b1c94f6e..3f76adb23fd1 100644
--- a/.github/workflows/swagger-modelvalidation-status.yaml
+++ b/.github/workflows/swagger-modelvalidation-status.yaml
@@ -1,4 +1,4 @@
-name: "[TEST-IGNORE] Swagger ModelValidation - Set Status"
+name: "Swagger ModelValidation - Set Status"
 
 on:
   # Must run on pull_request_target instead of pull_request, since the latter cannot trigger on
@@ -15,7 +15,7 @@ on:
       - labeled
       - unlabeled
   workflow_run:
-    workflows: ["\\[TEST-IGNORE\\] Swagger ModelValidation - Analyze Code"]
+    workflows: ["Swagger ModelValidation - Analyze Code"]
     types: [completed]
 
 permissions:
@@ -30,6 +30,6 @@ jobs:
     name: Set ModelValidation Status
     uses: ./.github/workflows/_reusable-set-check-status.yaml
     with:
-      monitored_workflow_name: "[TEST-IGNORE] Swagger ModelValidation - Analyze Code"
-      required_check_name: "[TEST-IGNORE] Swagger ModelValidation"
+      monitored_workflow_name: "Swagger ModelValidation - Analyze Code"
+      required_check_name: "Swagger ModelValidation"
       overriding_label: "Approved-ModelValidation"
diff --git a/.github/workflows/swagger-semanticvalidation-code.yaml b/.github/workflows/swagger-semanticvalidation-code.yaml
index ffe0464d4ff2..540c54de140b 100644
--- a/.github/workflows/swagger-semanticvalidation-code.yaml
+++ b/.github/workflows/swagger-semanticvalidation-code.yaml
@@ -1,4 +1,4 @@
-name: "[TEST-IGNORE] Swagger SemanticValidation - Analyze Code"
+name: "Swagger SemanticValidation - Analyze Code"
 
 on: pull_request
 
@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   oav:
-    name: "[TEST-IGNORE] Swagger SemanticValidation - Analyze Code"
+    name: "Swagger SemanticValidation - Analyze Code"
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/swagger-semanticvalidation-status.yaml b/.github/workflows/swagger-semanticvalidation-status.yaml
index 1166cb44ba20..62f432524f17 100644
--- a/.github/workflows/swagger-semanticvalidation-status.yaml
+++ b/.github/workflows/swagger-semanticvalidation-status.yaml
@@ -1,4 +1,4 @@
-name: "[TEST-IGNORE] Swagger SemanticValidation - Set Status"
+name: "Swagger SemanticValidation - Set Status"
 
 on:
   # Must run on pull_request_target instead of pull_request, since the latter cannot trigger on
@@ -15,7 +15,7 @@ on:
       - labeled
       - unlabeled
   workflow_run:
-    workflows: ["\\[TEST-IGNORE\\] Swagger SemanticValidation - Analyze Code"]
+    workflows: ["Swagger SemanticValidation - Analyze Code"]
     types: [completed]
 
 permissions:
@@ -30,6 +30,6 @@ jobs:
     name: Set SemanticValidation Status
     uses: ./.github/workflows/_reusable-set-check-status.yaml
     with:
-      monitored_workflow_name: "[TEST-IGNORE] Swagger SemanticValidation - Analyze Code"
-      required_check_name: "[TEST-IGNORE] Swagger SemanticValidation"
+      monitored_workflow_name: "Swagger SemanticValidation - Analyze Code"
+      required_check_name: "Swagger SemanticValidation"
       overriding_label: "Approved-SemanticValidation"
diff --git a/.github/workflows/test/summarize-checks/fixtures/RawGraphQLResponse.json b/.github/workflows/test/summarize-checks/fixtures/RawGraphQLResponse.json
index 002bee336055..16d0e10c03c5 100644
--- a/.github/workflows/test/summarize-checks/fixtures/RawGraphQLResponse.json
+++ b/.github/workflows/test/summarize-checks/fixtures/RawGraphQLResponse.json
@@ -339,13 +339,13 @@
                         "id": "WFR_kwLOAlSEjc8AAAAD3GhuLA",
                         "databaseId": 16582733356,
                         "workflow": {
-                            "name": "[TEST-IGNORE] Summarize PR Impact"
+                            "name": "Summarize PR Impact"
                         }
                     },
                     "checkRuns": {
                         "nodes": [
                             {
-                                "name": "[TEST-IGNORE] Summarize PR Impact",
+                                "name": "Summarize PR Impact",
                                 "status": "COMPLETED",
                                 "conclusion": "SUCCESS",
                                 "isRequired": false
diff --git a/.github/workflows/test/summarize-checks/summarize-checks.test.js b/.github/workflows/test/summarize-checks/summarize-checks.test.js
index 08a46096cb8a..32be62d3cea0 100644
--- a/.github/workflows/test/summarize-checks/summarize-checks.test.js
+++ b/.github/workflows/test/summarize-checks/summarize-checks.test.js
@@ -146,7 +146,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         expectedComment,
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "FAILURE",
           summary:
             "❌ This PR cannot be merged because some requirements are not met. See the details.",
@@ -256,7 +256,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         '<h2>Next Steps to Merge</h2>✅ All automated merging requirements have been met! To get your PR merged, see <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.',
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "SUCCESS",
           summary: `✅ All automated merging requirements have been met.<br/>To merge this PR, refer to <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.<br/>For help, consult comments on this PR and see [aka.ms/azsdk/pr-getting-help](https://aka.ms/azsdk/pr-getting-help).`,
         },
@@ -283,7 +283,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         '<h2>Next Steps to Merge</h2>✅ All automated merging requirements have been met! To get your PR merged, see <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.',
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "SUCCESS",
           summary: `✅ All automated merging requirements have been met.<br/>To merge this PR, refer to <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.<br/>For help, consult comments on this PR and see [aka.ms/azsdk/pr-getting-help](https://aka.ms/azsdk/pr-getting-help).`,
         },
@@ -391,7 +391,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         "<h2>Next Steps to Merge</h2>⌛ Please wait. Next steps to merge this PR are being evaluated by automation. ⌛",
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "pending",
           summary: "The requirements for merging this PR are still being evaluated. Please wait.",
         },
@@ -499,7 +499,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         "<h2>Next Steps to Merge</h2>⌛ Please wait. Next steps to merge this PR are being evaluated by automation. ⌛",
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "pending",
           summary: "The requirements for merging this PR are still being evaluated. Please wait.",
         },
@@ -564,7 +564,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         '<h2>Next Steps to Merge</h2>✅ All automated merging requirements have been met! To get your PR merged, see <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.',
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "SUCCESS",
           summary: `✅ All automated merging requirements have been met.<br/>To merge this PR, refer to <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.<br/>For help, consult comments on this PR and see [aka.ms/azsdk/pr-getting-help](https://aka.ms/azsdk/pr-getting-help).`,
         },
@@ -635,7 +635,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         '<h2>Next Steps to Merge</h2>✅ All automated merging requirements have been met! To get your PR merged, see <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.',
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "SUCCESS",
           summary: `✅ All automated merging requirements have been met.<br/>To merge this PR, refer to <a href="https://aka.ms/azsdk/specreview/merge">aka.ms/azsdk/specreview/merge</a>.<br/>For help, consult comments on this PR and see [aka.ms/azsdk/pr-getting-help](https://aka.ms/azsdk/pr-getting-help).`,
         },
@@ -691,7 +691,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         "<h2>Next Steps to Merge</h2>⌛ Please wait. Next steps to merge this PR are being evaluated by automation. ⌛",
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "pending",
           summary: "The requirements for merging this PR are still being evaluated. Please wait.",
         },
@@ -739,7 +739,7 @@ describe("Summarize Checks Unit Tests", () => {
       const expectedOutput = [
         "<h2>Next Steps to Merge</h2>⌛ Please wait. Next steps to merge this PR are being evaluated by automation. ⌛",
         {
-          name: "[TEST-IGNORE] Automated merging requirements met",
+          name: "Automated merging requirements met",
           result: "pending",
           summary: "The requirements for merging this PR are still being evaluated. Please wait.",
         },
@@ -784,7 +784,7 @@ describe("Summarize Checks Unit Tests", () => {
       const targetBranch = "main";
       const labelNames = [];
       const expectedCheckOutput = {
-        name: "[TEST-IGNORE] Automated merging requirements met",
+        name: "Automated merging requirements met",
         result: "FAILURE",
         summary:
           "❌ This PR cannot be merged because some requirements are not met. See the details.",
@@ -827,7 +827,7 @@ describe("Summarize Checks Unit Tests", () => {
       const labelNames = [];
       const fyiCheckRuns = [];
       const expectedCheckOutput = {
-        name: "[TEST-IGNORE] Automated merging requirements met",
+        name: "Automated merging requirements met",
         result: "FAILURE",
         summary:
           "❌ This PR cannot be merged because some requirements are not met. See the details.",
diff --git a/.github/workflows/watch-breakingchange-crossversion.yaml b/.github/workflows/watch-breakingchange-crossversion.yaml
index 41fa9752c676..b9cc51e051db 100644
--- a/.github/workflows/watch-breakingchange-crossversion.yaml
+++ b/.github/workflows/watch-breakingchange-crossversion.yaml
@@ -24,4 +24,4 @@ jobs:
     uses: ./.github/workflows/_reusable-verify-run-status.yaml
     with:
       check_run_name: "Breaking Change(Cross-Version)"
-      commit_status_name: "[TEST-IGNORE] Breaking Change(Cross-Version)"
+      commit_status_name: "Breaking Change(Cross-Version)"
diff --git a/.github/workflows/watch-breakingchange.yaml b/.github/workflows/watch-breakingchange.yaml
index 50978f8a475b..973cd767f28f 100644
--- a/.github/workflows/watch-breakingchange.yaml
+++ b/.github/workflows/watch-breakingchange.yaml
@@ -24,4 +24,4 @@ jobs:
     uses: ./.github/workflows/_reusable-verify-run-status.yaml
     with:
       check_run_name: "Swagger BreakingChange"
-      commit_status_name: "[TEST-IGNORE] Swagger BreakingChange"
+      commit_status_name: "Swagger BreakingChange"
diff --git a/.github/workflows/watch-modelvalidation.yaml b/.github/workflows/watch-modelvalidation.yaml
index ba3ff8165018..1332e682072e 100644
--- a/.github/workflows/watch-modelvalidation.yaml
+++ b/.github/workflows/watch-modelvalidation.yaml
@@ -24,4 +24,4 @@ jobs:
     uses: ./.github/workflows/_reusable-verify-run-status.yaml
     with:
       check_run_name: "Swagger ModelValidation"
-      workflow_name: "[TEST-IGNORE] Swagger ModelValidation"
+      workflow_name: "Swagger ModelValidation"
diff --git a/.github/workflows/watch-semanticvalidation.yaml b/.github/workflows/watch-semanticvalidation.yaml
index 757e55e367d6..d63d123f2341 100644
--- a/.github/workflows/watch-semanticvalidation.yaml
+++ b/.github/workflows/watch-semanticvalidation.yaml
@@ -24,4 +24,4 @@ jobs:
     uses: ./.github/workflows/_reusable-verify-run-status.yaml
     with:
       check_run_name: "Swagger SemanticValidation"
-      workflow_name: "[TEST-IGNORE] Swagger SemanticValidation"
+      workflow_name: "Swagger SemanticValidation"

From d3f1ca67f4792e5d025e21de906b850dce9b175d Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 15:29:35 -0700
Subject: [PATCH 02/34] Updated tag value for the Timezone Service to conform
 to standards. (#36005)

* Updated tag value for the Timezone Service to conform to standards.

* changed tag

* changed tag
---
 specification/maps/data-plane/Timezone/readme.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/specification/maps/data-plane/Timezone/readme.md b/specification/maps/data-plane/Timezone/readme.md
index 99b49c01b120..8dd995692be5 100644
--- a/specification/maps/data-plane/Timezone/readme.md
+++ b/specification/maps/data-plane/Timezone/readme.md
@@ -27,7 +27,7 @@ These are the global settings for Timezone Client.
 ``` yaml
 title: TimezoneClient
 openapi-type: data-plane
-tag: 1.0-preview
+tag: package-stable-1.0
 # at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
@@ -45,11 +45,11 @@ directive:
 ```
 
 
-### Tag: 1.0-preview
+### Tag: package-stable-1.0
 
-These settings apply only when `--tag=1.0-preview` is specified on the command line.
+These settings apply only when `--tag=package-stable-1.0` is specified on the command line.
 
-``` yaml $(tag) == '1.0-preview'
+``` yaml $(tag) == 'package-stable-1.0'
 input-file:
   - preview/1.0/timezone.json
 ```

From 04874acd9100aa1955ef567e3cc3d060647f33dd Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 15:30:32 -0700
Subject: [PATCH 03/34] Updated tag value for the Spatial Service to conform to
 standards. (#35998)

* Updated tag value for the Spatial Service to conform to standards.

* Updated tag.

* changed tag
---
 specification/maps/data-plane/Spatial/readme.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/specification/maps/data-plane/Spatial/readme.md b/specification/maps/data-plane/Spatial/readme.md
index 15723bd4f7d7..163ad91e1ce2 100644
--- a/specification/maps/data-plane/Spatial/readme.md
+++ b/specification/maps/data-plane/Spatial/readme.md
@@ -25,9 +25,10 @@ To see additional help and options, run:
 These are the global settings for Spatial Client.
 
 ``` yaml
+# Azure Maps Spatial v2022-08-01 has been deprecated and will be retired on September 30th, 2025.
 title: SpatialClient
 openapi-type: data-plane
-tag: 2022-08-01
+tag: package-stable-deprecated-2022-08-01
 # at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
@@ -35,11 +36,11 @@ credential-scopes: https://atlas.microsoft.com/.default
 ```
 
 
-### Tag: 2022-08-01
+### Tag: package-stable-deprecated-2022-08-01
 
-These settings apply only when `--tag=2022-08-01` is specified on the command line.
+These settings apply only when `--tag=package-stable-deprecated-2022-08-01` is specified on the command line.
 
-``` yaml $(tag) == '2022-08-01'
+``` yaml $(tag) == 'package-stable-deprecated-2022-08-01'
 input-file:
   - stable/2022-08-01/spatial.json
 ```

From 45b424c1db03013fad46540d6683da647298b8d8 Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 15:36:23 -0700
Subject: [PATCH 04/34] Updated tag values for Weather Service to conform to
 standards. (#35979)

* Updated tag values for Weather Service to conform to standards.

* Updated tag.

* changed tag

---------

Co-authored-by: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
---
 specification/maps/data-plane/Weather/readme.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/specification/maps/data-plane/Weather/readme.md b/specification/maps/data-plane/Weather/readme.md
index 5c84361bb31e..e4fdf67a07b2 100644
--- a/specification/maps/data-plane/Weather/readme.md
+++ b/specification/maps/data-plane/Weather/readme.md
@@ -25,9 +25,10 @@ To see additional help and options, run:
 These are the global settings for Weather Client.
 
 ``` yaml
+# 
 title: WeatherClient
 openapi-type: data-plane
-tag: 1.1
+tag: package-stable-1.1
 # at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
@@ -35,20 +36,20 @@ credential-scopes: https://atlas.microsoft.com/.default
 ```
 
 
-### Tag: 1.1
+### Tag: package-stable-1.1
 
-These settings apply only when `--tag=1.1` is specified on the command line.
+These settings apply only when `--tag=package-stable-1.1` is specified on the command line.
 
-``` yaml $(tag) == '1.1'
+``` yaml $(tag) == 'package-stable-1.1'
 input-file:
   - stable/1.1/weather.json
 ```
 
-### Tag: 1.0-preview
+### Tag: package-stable-1.0
 
-These settings apply only when `--tag=1.0-preview` is specified on the command line.
+These settings apply only when `--tag=package-stable-1.0` is specified on the command line.
 
-``` yaml $(tag) == '1.0-preview'
+``` yaml $(tag) == 'package-stable-1.0'
 input-file:
   - preview/1.0/weather.json
 ```

From 943615210ac5e5e5bc1795c3b83ee9241ccc9bb1 Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 15:44:27 -0700
Subject: [PATCH 05/34] Updated tag value for the Route Service to conform to
 standards. (#36002)

* Updated tag value for the Route Service to conform to standards.

* changed deprecated to retired

---------

Co-authored-by: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
---
 specification/maps/data-plane/Route/readme.md | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/specification/maps/data-plane/Route/readme.md b/specification/maps/data-plane/Route/readme.md
index f43027d651ce..d4aa904038b8 100644
--- a/specification/maps/data-plane/Route/readme.md
+++ b/specification/maps/data-plane/Route/readme.md
@@ -27,7 +27,7 @@ These are the global settings for Route Client.
 ``` yaml
 title: RouteClient
 openapi-type: data-plane
-tag: package-2025-01
+tag: package-stable-2025-01-01
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
 credential-scopes: 'https://atlas.microsoft.com/.default'
@@ -39,11 +39,11 @@ modelerfour:
   lenient-model-deduplication: true
 ```
 
-### Tag: package-2025-01
+### Tag: package-stable-2025-01-01
 
-These settings apply only when `--tag=package-2025-01` is specified on the command line.
+These settings apply only when `--tag=package-stable-2025-01-01` is specified on the command line.
 
-```yaml $(tag) == 'package-2025-01'
+```yaml $(tag) == 'package-stable-2025-01-01'
 input-file:
   - stable/2025-01-01/route.json
 
@@ -52,11 +52,11 @@ suppressions:
     reason: False alarm. Per the Noun_Verb convention for Operation Ids, the noun 'Route' should not appear after the underscore.
 ```
 
-### Tag: package-preview-2024-7
+### Tag: package-2024-07-01-preview
 
-These settings apply only when `--tag=package-preview-2024-07` is specified on the command line.
+These settings apply only when `--tag=package-2024-07-01-preview` is specified on the command line.
 
-```yaml $(tag) == 'package-preview-2024-07'
+```yaml $(tag) == 'package-2024-07-01-preview'
 input-file:
   - preview/2024-07-01-preview/route.json
   
@@ -65,11 +65,11 @@ suppressions:
     reason: False alarm. Per the Noun_Verb convention for Operation Ids, the noun 'Route' should not appear after the underscore.
 ```
 
-### Tag: package-preview-2024-6
+### Tag: package-retired-2024-06-01-preview
 
-These settings apply only when `--tag=package-preview-2024-06` is specified on the command line.
+These settings apply only when `--tag=package-2024-06-01-preview` is specified on the command line.
 
-```yaml $(tag) == 'package-preview-2024-06'
+```yaml $(tag) == 'package-2024-06-01-preview'
 input-file:
   - preview/2024-06-01-preview/route.json
   
@@ -78,11 +78,11 @@ suppressions:
     reason: False alarm. Per the Noun_Verb convention for Operation Ids, the noun 'Route' should not appear after the underscore.
 ```
 
-### Tag: package-preview-2024-5
+### Tag: package-retired-2024-05-01-preview
 
-These settings apply only when `--tag=package-preview-2024-05` is specified on the command line.
+These settings apply only when `--tag=package-2024-05-01-preview` is specified on the command line.
 
-```yaml $(tag) == 'package-preview-2024-05'
+```yaml $(tag) == 'package-2024-05-01-preview'
 input-file:
   - preview/2024-05-01-preview/route.json
 
@@ -91,47 +91,47 @@ suppressions:
     reason: False alarm. Per the Noun_Verb convention for Operation Ids, the noun 'Route' should not appear after the underscore.
 ```
 
-### Tag: package-preview-2024-04
+### Tag: package-2024-04-01-preview
 
-These settings apply only when `--tag=package-preview-2024-04` is specified on the command line.
+These settings apply only when `--tag=package-2024-04-01-preview` is specified on the command line.
 
-```yaml $(tag) == 'package-preview-2024-04'
+```yaml $(tag) == 'package-2024-04-01-preview'
 input-file:
   - preview/2024-04-01-preview/route.json
 ```
 
-### Tag: package-preview-2023-10
+### Tag: package-retired-2023-10-01-preview
 
-These settings apply only when `--tag=package-preview-2023-10` is specified on the command line.
+These settings apply only when `--tag=package-retired-2023-10-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2023-10'
+``` yaml $(tag) == 'package-retired-2023-10-01-preview'
 input-file:
   - preview/2023-10-01-preview/route.json
 ```
 
-### Tag: package-preview-2023-09
+### Tag: package-retired-2023-09-01-preview
 
-These settings apply only when `--tag=package-preview-2023-09` is specified on the command line.
+These settings apply only when `--tag=package-retired-2023-09-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2023-09'
+``` yaml $(tag) == 'package-retired-2023-09-01-preview'
 input-file:
   - preview/2023-09-01-preview/route.json
 ```
 
-### Tag: package-preview-2023-08
+### Tag: package-retired-2023-08-01-preview
 
-These settings apply only when `--tag=package-preview-2023-08` is specified on the command line.
+These settings apply only when `--tag=package-retired-2023-08-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2023-08'
+``` yaml $(tag) == 'package-retired-2023-08-01-preview'
 input-file:
   - preview/2023-08-01-preview/route.json
 ```
 
-### Tag: 1.0
+### Tag: package-stable-deprecated-1.0
 
-These settings apply only when `--tag=1.0` is specified on the command line.
+These settings apply only when `--tag=package-stable-deprecated-1.0` is specified on the command line.
 
-``` yaml $(tag) == '1.0'
+``` yaml $(tag) == 'package-stable-deprecated-1.0'
 input-file:
   - preview/1.0/route.json
 ```

From de5e378503d0cdce3f033f75944fbf2fc3c8e5bc Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 15:45:18 -0700
Subject: [PATCH 06/34] Updated tag value for the Geolocation Service to
 conform to standards. (#35984)

* Updated tag value for the Geolocation Service to conform to standards.

* Updated tag.

* changed preview to stable

---------

Co-authored-by: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
---
 specification/maps/data-plane/Geolocation/readme.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/specification/maps/data-plane/Geolocation/readme.md b/specification/maps/data-plane/Geolocation/readme.md
index 4892ded65015..bd508060ae3b 100644
--- a/specification/maps/data-plane/Geolocation/readme.md
+++ b/specification/maps/data-plane/Geolocation/readme.md
@@ -27,7 +27,7 @@ These are the global settings for Geolocation Client.
 ``` yaml
 title: GeolocationClient
 openapi-type: data-plane
-tag: 1.0-preview
+tag: package-stable-1.0
 # at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
@@ -35,11 +35,11 @@ credential-scopes: https://atlas.microsoft.com/.default
 ```
 
 
-### Tag: 1.0-preview
+### Tag: package-stable-1.0
 
-These settings apply only when `--tag=1.0-preview` is specified on the command line.
+These settings apply only when `--tag=package-stable-1.0` is specified on the command line.
 
-``` yaml $(tag) == '1.0-preview'
+``` yaml $(tag) == 'package-stable-1.0'
 input-file:
   - preview/1.0/geolocation.json
 ```

From 4cf6f80480f28989b3af4704a0f8b3c86c9d9e82 Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@microsoft.com>
Date: Tue, 5 Aug 2025 16:10:43 -0700
Subject: [PATCH 07/34] Flipped .net required settings to false (#36465)

---
 eng/tools/spec-gen-sdk-runner/src/types.ts                | 2 +-
 .../spec-gen-sdk-runner/test/command-helpers.test.ts      | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/eng/tools/spec-gen-sdk-runner/src/types.ts b/eng/tools/spec-gen-sdk-runner/src/types.ts
index 3df7258b96c2..e50d63947b77 100644
--- a/eng/tools/spec-gen-sdk-runner/src/types.ts
+++ b/eng/tools/spec-gen-sdk-runner/src/types.ts
@@ -93,7 +93,7 @@ export const SpecGenSdkRequiredSettings: Record<SdkName, PlaneTypeSettings> = {
   },
   "azure-sdk-for-net": {
     dataPlane: false,
-    managementPlane: true,
+    managementPlane: false,
   },
   "azure-sdk-for-python": {
     dataPlane: true,
diff --git a/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts b/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts
index 0a8bff456782..9fefa8d61f25 100644
--- a/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts
+++ b/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts
@@ -604,8 +604,8 @@ describe("commands.ts", () => {
       expect(result).toBe(true);
 
       const result2 = getRequiredSettingValue(true, true, "azure-sdk-for-net");
-      // When hasTypeSpecProjects is true, .NET SDK follows normal rules (managementPlane: true)
-      expect(result2).toBe(true);
+      // .NET SDK set (managementPlane: false)
+      expect(result2).toBe(false);
     });
 
     test("should return dataPlane setting when hasManagementPlaneSpecs is false", () => {
@@ -616,6 +616,10 @@ describe("commands.ts", () => {
       const result2 = getRequiredSettingValue(false, true, "azure-sdk-for-js");
       // Based on the constants in types.ts, JS SDK does not require check for data plane
       expect(result2).toBe(false);
+
+      const result3 = getRequiredSettingValue(false, true, "azure-sdk-for-net");
+      // .NET SDK set (dataplane: false)
+      expect(result3).toBe(false);
     });
 
     test("should return false for azure-sdk-for-net when hasTypeSpecProjects is false", () => {

From 585d408fd16dd94ab46b1b77071bb015b15ea888 Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 16:27:20 -0700
Subject: [PATCH 08/34] Search readme (#36038)

* Updated tag value for the Search Service to conform to standards.

* Updated tag value for the Search Service to conform to standards.

* changed tag

* changed tag

* changed tag

* changed tag

* tag

---------

Co-authored-by: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
---
 .../maps/data-plane/Search/readme.md          | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/specification/maps/data-plane/Search/readme.md b/specification/maps/data-plane/Search/readme.md
index 872c83ae9393..2d4185dad0f3 100644
--- a/specification/maps/data-plane/Search/readme.md
+++ b/specification/maps/data-plane/Search/readme.md
@@ -27,7 +27,7 @@ These are the global settings for Search Client.
 ``` yaml
 title: SearchClient
 openapi-type: data-plane
-tag: package-2025-01
+tag: package-stable-2025-01-01
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
 credential-scopes: 'https://atlas.microsoft.com/.default'
@@ -39,84 +39,85 @@ modelerfour:
   lenient-model-deduplication: true
 ```
 
-### Tag: package-preview-2025-06
+### Tag: package-stable-2025-01-01
 
-These settings apply only when `--tag=package-preview-2025-06` is specified on the command line.
+These settings apply only when `--tag=package-stable-2025-01-01` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2025-06'
+```yaml $(tag) == 'package-stable-2025-01-01'
 input-file:
-  - preview/2025-06-01-preview/search.json
+  - stable/2025-01-01/search.json
 ```
 
-### Tag: package-2025-01
+### Tag: package-stable-2023-06-01
 
-These settings apply only when `--tag=package-2025-01` is specified on the command line.
+These settings apply only when `--tag=package-stable-2023-06-01` is specified on the command line.
 
-```yaml $(tag) == 'package-2025-01'
+```yaml $(tag) == 'package-stable-2023-06-01'
 input-file:
-  - stable/2025-01-01/search.json
+  - stable/2023-06-01/search.json
 ```
 
-### Tag: package-preview-2024-04
+### Tag: package-2025-06-01-preview
 
-These settings apply only when `--tag=package-preview-2024-04` is specified on the command line.
+These settings apply only when `--tag=package-2025-06-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2024-04'
+``` yaml $(tag) == 'package-2025-06-01-preview'
 input-file:
-  - preview/2024-04-01-preview/search.json
+  - preview/2025-06-01-preview/search.json
 ```
 
-### Tag: package-2023-06
+### Tag: package-retired-2024-04-01-preview
 
-These settings apply only when `--tag=package-2023-06` is specified on the command line.
+These settings apply only when `--tag=package-retired-2024-04-01-preview` is specified on the command line.
 
-```yaml $(tag) == 'package-2023-06'
+``` yaml $(tag) == 'package-retired-2024-04-01-preview'
 input-file:
-  - stable/2023-06-01/search.json
+  - preview/2024-04-01-preview/search.json
 ```
-### Tag: 1.0
 
-These settings apply only when `--tag=1.0` is specified on the command line.
+### Tag: package-retired-2022-12-01-preview
+
+These settings apply only when `--tag=package-retired-2022-12-01-preview` is specified on the command line.
 
-``` yaml $(tag) == '1.0'
+``` yaml $(tag) == 'package-retired-2022-12-01-preview'
 input-file:
-  - preview/1.0/search.json
+  - preview/2022-12-01-preview/search.json
 ```
 
-### Tag: 2.0-preview
+### Tag: package-retired-2022-09-01-preview
 
-These settings apply only when `--tag=2021-11-01-preview` is specified on the command line.
+These settings apply only when `--tag=package-retired-2022-09-01-preview` is specified on the command line.
 
-``` yaml $(tag) == '2021-11-01-preview'
+``` yaml $(tag) == 'package-retired-2022-09-01-preview'
 input-file:
-  - preview/2021-11-01-preview/geocoding.json
+  - preview/2022-09-01-preview/search.json
 ```
 
-### Tag: 2.1-preview
+### Tag: package-retired-2022-02-01-preview
 
-These settings apply only when `--tag=2022-02-01-preview` is specified on the command line.
+These settings apply only when `--tag=package-retired-2022-02-01-preview` is specified on the command line.
 
-``` yaml $(tag) == '2022-02-01-preview'
+``` yaml $(tag) == 'package-retired-2022-02-01-preview'
 input-file:
   - preview/2022-02-01-preview/geocoding.json
 ```
 
-### Tag: package-preview-2022-09
+### Tag: package-retired-2021-11-01-preview
 
-These settings apply only when `--tag=package-preview-2022-09` is specified on the command line.
+These settings apply only when `--tag=package-retired-2021-11-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2022-09'
+``` yaml $(tag) == 'package-retired-2021-11-01-preview'
 input-file:
-  - preview/2022-09-01-preview/search.json
+  - preview/2021-11-01-preview/geocoding.json
 ```
 
-### Tag: package-preview-2022-12
+### Tag: package-stable-1.0
 
-These settings apply only when `--tag=package-preview-2022-12` is specified on the command line.
+These settings apply only when `--tag=package-stable-1.0` is specified on the command line.
 
-``` yaml $(tag) == 'package-preview-2022-12'
+``` yaml $(tag) == 'package-stable-1.0'
 input-file:
-  - preview/2022-12-01-preview/search.json
+  - preview/1.0/search.json
 ```
 
 # Code Generation

From 0706188331c6da21bc5c6df8d7f5fe86e442f8b7 Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 17:10:50 -0700
Subject: [PATCH 09/34] Updated tag values for the Data Registry Service to
 conform to standards (#35981)

* Updated tag values for the Data Registry Service to conform to standards.

* Updated tag.

* tag

---------

Co-authored-by: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
---
 .../maps/data-plane/DataRegistry/readme.md        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/specification/maps/data-plane/DataRegistry/readme.md b/specification/maps/data-plane/DataRegistry/readme.md
index 8f8d67c3b276..33d5d3012c12 100644
--- a/specification/maps/data-plane/DataRegistry/readme.md
+++ b/specification/maps/data-plane/DataRegistry/readme.md
@@ -25,29 +25,30 @@ To see additional help and options, run:
 These are the global settings for Data Registry Client.
 
 ``` yaml
+# Azure Maps Data Registry APIs V 06-01-2023 will be retired on September 30th, 2025.
 title: DataRegistryClient
 openapi-type: data-plane
-tag: 2023-06-01
+tag: package-stable-2023-06-01
 # at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
 credential-scopes: https://atlas.microsoft.com/.default
 ```
 
-### Tag: 2023-06-01
+### Tag: package-stable-2023-06-01
 
-These settings apply only when `--tag=2023-06-01` is specified on the command line.
+These settings apply only when `--tag=package-stable-2023-06-01` is specified on the command line.
 
-``` yaml $(tag) == '2023-06-01'
+``` yaml $(tag) == 'package-stable-2023-06-01'
 input-file:
   - stable/2023-06-01/dataregistry.json
 ```
 
-### Tag: 2022-12-01
+### Tag: package-retired-2022-12-01-preview
 
-These settings apply only when `--tag=2022-12-01-preview` is specified on the command line.
+These settings apply only when `--tag=package-retired-2022-12-01-preview` is specified on the command line.
 
-``` yaml $(tag) == '2022-12-01-preview'
+``` yaml $(tag) == 'package-retired-2022-12-01-preview'
 input-file:
   - preview/2022-12-01-preview/dataregistry.json
 ```

From e9d78a9e701448ffef03a09fce0f9d5ac0bc3304 Mon Sep 17 00:00:00 2001
From: steve munk <stevemunk@hotmail.com>
Date: Tue, 5 Aug 2025 17:40:29 -0700
Subject: [PATCH 10/34] Updated tag value for Creator services to conform to
 standards. (#36045)

* Updated tag value for Creator services to conform to standards.

* tag

---------

Co-authored-by: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
---
 .../maps/data-plane/Creator/readme.md         | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/specification/maps/data-plane/Creator/readme.md b/specification/maps/data-plane/Creator/readme.md
index 27ebf1e09a53..5662b737bac0 100644
--- a/specification/maps/data-plane/Creator/readme.md
+++ b/specification/maps/data-plane/Creator/readme.md
@@ -27,7 +27,7 @@ These are the global settings for Creator Client.
 ``` yaml
 title: CreatorClient
 openapi-type: data-plane
-tag: package-stable-V2
+tag: package-stable-2.0
 add-credentials: true
 credential-default-policy-type: BearerTokenCredentialPolicy
 credential-scopes: 'https://atlas.microsoft.com/.default'
@@ -45,11 +45,11 @@ directive:
     reason: false positive from oav is breaking our example validation. See azure/oav#1021.
 ```
 
-### Tag: package-stable-V2
+### Tag: package-stable-2.0
 
-These settings apply only when `--tag=package-stable-V2` is specified on the command line.
+These settings apply only when `--tag=package-stable-2.0` is specified on the command line.
 
-```yaml $(tag) == 'package-stable-V2'
+```yaml $(tag) == 'package-stable-2.0'
 input-file:
   - preview/2.0/alias.json
   - preview/2.0/dataset.json
@@ -60,11 +60,11 @@ input-file:
 
 ```
 
-### Tag: package-2023-03-preview
+### Tag: package-2023-03-01-preview
 
-These settings apply only when `--tag=package-2023-03-preview` is specified on the command line.
+These settings apply only when `--tag=package-2023-03-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2023-03-preview'
+``` yaml $(tag) == 'package-2023-03-01-preview'
 input-file:
   - preview/2023-03-01-preview/alias.json
   - preview/2023-03-01-preview/dataset.json
@@ -78,11 +78,11 @@ input-file:
   - preview/2023-03-01-preview/wayfind.json
 ```
 
-### Tag: package-2022-09-preview
+### Tag: package-retired-2022-09-01-preview
 
-These settings apply only when `--tag=package-2022-09-preview` is specified on the command line.
+These settings apply only when `--tag=package-retired-2022-09-01-preview` is specified on the command line.
 
-``` yaml $(tag) == 'package-2022-09-preview'
+``` yaml $(tag) == 'package-retired-2022-09-01-preview'
 input-file:
   - preview/2022-09-01-preview/tileset.json
   - preview/2022-09-01-preview/style.json
@@ -96,11 +96,11 @@ input-file:
   - preview/2.0/wfs.json
 ```
 
-### Tag: package-2023-07
+### Tag: package-retired-2023-07-01
 
-These settings apply only when `--tag=package-2023-07` is specified on the command line.
+These settings apply only when `--tag=package-retired-2023-07-01` is specified on the command line.
 
-``` yaml $(tag) == 'package-2023-07'
+``` yaml $(tag) == 'package-retired-2023-07-01'
 input-file:
   - stable/2023-07-01/alias.json
   - stable/2023-07-01/dataset.json

From 14258ac098549961b5c536d8d973719b3d65a467 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 18:10:45 -0700
Subject: [PATCH 11/34] Bump @azure-tools/typespec-client-generator-cli
 (#36471)

Bumps the typespec-client-generator-cli group with 1 update in the / directory: [@azure-tools/typespec-client-generator-cli](https://github.com/Azure/azure-sdk-tools).


Updates `@azure-tools/typespec-client-generator-cli` from 0.26.1 to 0.27.0
- [Release notes](https://github.com/Azure/azure-sdk-tools/releases)
- [Commits](https://github.com/Azure/azure-sdk-tools/commits)

---
updated-dependencies:
- dependency-name: "@azure-tools/typespec-client-generator-cli"
  dependency-version: 0.27.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: typespec-client-generator-cli
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7d9ed0e2e45c..565f31b54a74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@azure-tools/typespec-azure-portal-core": "0.58.0",
         "@azure-tools/typespec-azure-resource-manager": "0.58.1",
         "@azure-tools/typespec-azure-rulesets": "0.58.0",
-        "@azure-tools/typespec-client-generator-cli": "0.26.1",
+        "@azure-tools/typespec-client-generator-cli": "0.27.0",
         "@azure-tools/typespec-client-generator-core": "0.58.1",
         "@azure-tools/typespec-liftr-base": "0.8.0",
         "@azure/avocado": "^0.9.1",
@@ -1175,9 +1175,9 @@
       }
     },
     "node_modules/@azure-tools/typespec-client-generator-cli": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-cli/-/typespec-client-generator-cli-0.26.1.tgz",
-      "integrity": "sha512-HM+MfBHDk1ynyoQASppcj+3a1hKAIMKD8HJ172/OF47QsWjBXFnywhwsVbJkw4ap/lb4TOvK406NsEpACJqguQ==",
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-cli/-/typespec-client-generator-cli-0.27.0.tgz",
+      "integrity": "sha512-m1XQdbA8WdMKcv+f2ehfgGXPm+Br6Rneqa1Rmvi4kNHO2Bs1pvsCUiD+2hh0DD7t78pkcQ0bJLzeU35kzblo3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 7da76ff3d6e9..863142289f85 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "@azure-tools/typespec-azure-portal-core": "0.58.0",
     "@azure-tools/typespec-azure-resource-manager": "0.58.1",
     "@azure-tools/typespec-azure-rulesets": "0.58.0",
-    "@azure-tools/typespec-client-generator-cli": "0.26.1",
+    "@azure-tools/typespec-client-generator-cli": "0.27.0",
     "@azure-tools/typespec-client-generator-core": "0.58.1",
     "@azure-tools/typespec-liftr-base": "0.8.0",
     "@autorest/openapi-to-typespec": "0.11.5",

From dfd89be5b5903646b7d1ec904188132f68cdcf1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 18:11:13 -0700
Subject: [PATCH 12/34] Bump zod from 4.0.14 to 4.0.15 in /.github (#36470)

Bumps [zod](https://github.com/colinhacks/zod) from 4.0.14 to 4.0.15.
- [Release notes](https://github.com/colinhacks/zod/releases)
- [Commits](https://github.com/colinhacks/zod/compare/v4.0.14...v4.0.15)

---
updated-dependencies:
- dependency-name: zod
  dependency-version: 4.0.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/package-lock.json b/.github/package-lock.json
index d343326809f2..6a8a741a79d9 100644
--- a/.github/package-lock.json
+++ b/.github/package-lock.json
@@ -4679,9 +4679,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "4.0.14",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.0.14.tgz",
-      "integrity": "sha512-nGFJTnJN6cM2v9kXL+SOBq3AtjQby3Mv5ySGFof5UGRHrRioSJ5iG680cYNjE/yWk671nROcpPj4hAS8nyLhSw==",
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.0.15.tgz",
+      "integrity": "sha512-2IVHb9h4Mt6+UXkyMs0XbfICUh1eUrlJJAOupBHUhLRnKkruawyDddYRCs0Eizt900ntIMk9/4RksYl+FgSpcQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"

From 2a6e9b63a0340623c39a25954d11707ffd399fcc Mon Sep 17 00:00:00 2001
From: Yuchao Yan <yuchaoyan@microsoft.com>
Date: Wed, 6 Aug 2025 10:44:58 +0800
Subject: [PATCH 13/34] [databoxedge][python] Convert to singleapi (#35688)

---
 .../resource-manager/readme.python.md         | 46 ++-----------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/specification/databoxedge/resource-manager/readme.python.md b/specification/databoxedge/resource-manager/readme.python.md
index 7b078ae704df..16c063ba73e2 100644
--- a/specification/databoxedge/resource-manager/readme.python.md
+++ b/specification/databoxedge/resource-manager/readme.python.md
@@ -2,54 +2,18 @@
 
 These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
-Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
 
 ``` yaml $(python)
+title: DataBoxEdgeManagementClient
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
-namespace: azure.mgmt.databoxedge
 package-name: azure-mgmt-databoxedge
-title: DataBoxEdgeManagementClient
-description: The DataBoxEdge Client.
+namespace: azure.mgmt.databoxedge
 package-version: 1.0.0b1
 clear-output-folder: true
-no-namespace-folders: true
-```
-
-### Python multi-api
-
-Generate all API versions currently shipped for this package
-
-```yaml $(python)
-multiapi: true
-default-api-version: "2019-08-01"
-batch:
-  - tag: package-2021-02-01-preview
-  - tag: package-2019-08
-  - multiapiscript: true
-```
-
-``` yaml $(multiapiscript)
-output-folder: $(python-sdks-folder)/databoxedge/azure-mgmt-databoxedge/azure/mgmt/databoxedge/
-perform-load: false
 ```
 
-### Tag: package-2021-02-01-preview and python
-
-These settings apply only when `--tag=package-2021-02-01-preview --python` is specified on the command line.
-Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
-
-``` yaml $(tag) == 'package-2021-02-01-preview' && $(python)
-namespace: azure.mgmt.databoxedge.v2021_02_01_preview
-output-folder: $(python-sdks-folder)/databoxedge/azure-mgmt-databoxedge/azure/mgmt/databoxedge/v2021_02_01_preview
-```
-
-### Tag: package-2019-08 and python
-
-These settings apply only when `--tag=package-2019-08 --python` is specified on the command line.
-Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
-
-``` yaml $(tag) == 'package-2019-08' && $(python)
-namespace: azure.mgmt.databoxedge.v2019_08_01
-output-folder: $(python-sdks-folder)/databoxedge/azure-mgmt-databoxedge/azure/mgmt/databoxedge/v2019_08_01
+``` yaml $(python)
+no-namespace-folders: true
+output-folder: $(python-sdks-folder)/databoxedge/azure-mgmt-databoxedge/azure/mgmt/databoxedge
 ```

From eb75e08433faca85ab4f6d465a0e2019442fb4f6 Mon Sep 17 00:00:00 2001
From: Chenjie Shi <tadelesh.shi@live.cn>
Date: Wed, 6 Aug 2025 10:57:27 +0800
Subject: [PATCH 14/34] Fix Go SDK breaking changes for Nginx (#36328)

Co-authored-by: tadelesh <chenjieshi@microsoft.com>
---
 specification/nginx/Nginx.Management/client.tsp    | 14 ++++++++++----
 .../nginx/Nginx.Management/tspconfig.yaml          |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/specification/nginx/Nginx.Management/client.tsp b/specification/nginx/Nginx.Management/client.tsp
index 501351452ac6..73e45c8205df 100644
--- a/specification/nginx/Nginx.Management/client.tsp
+++ b/specification/nginx/Nginx.Management/client.tsp
@@ -55,10 +55,10 @@ using NGINX.NGINXPLUS;
   "NginxDeploymentPropertiesNginxAppProtect",
   "!csharp"
 );
-// @@clientName(AutoScaleSettings,
-//   "NginxDeploymentScalingPropertiesAutoScaleSettings",
-//   "!csharp"
-// );
+@@clientName(AutoScaleSettings,
+  "NginxDeploymentScalingPropertiesAutoScaleSettings",
+  "!csharp"
+);
 
 // Client location overrides for NginxDeployments operations
 @@clientLocation(NginxDeployments.get, "Deployments", "!csharp");
@@ -75,6 +75,12 @@ using NGINX.NGINXPLUS;
   "!csharp"
 );
 
+// Client name for list operations
+@@clientName(NginxDeployments.listBySubscription, "list", "!csharp");
+@@clientName(ApiKeys.listByDeployment, "list", "!csharp");
+@@clientName(Certificates.listByDeployment, "list", "!csharp");
+@@clientName(Configurations.listByDeployment, "list", "!csharp");
+
 // Java client name overrides to maintain consistent casing
 @@clientName(NginxPublicIPAddress, "NginxPublicIpAddress", "java");
 @@clientName(NginxPrivateIPAddress, "NginxPrivateIpAddress", "java");
diff --git a/specification/nginx/Nginx.Management/tspconfig.yaml b/specification/nginx/Nginx.Management/tspconfig.yaml
index 57c03007d51e..4cd08c8b3695 100644
--- a/specification/nginx/Nginx.Management/tspconfig.yaml
+++ b/specification/nginx/Nginx.Management/tspconfig.yaml
@@ -37,7 +37,7 @@ options:
     service-dir: "sdk/resourcemanager/nginx"
     package-dir: "armnginx"
     module: "github.com/Azure/azure-sdk-for-go/{service-dir}/{package-dir}"
-    fix-const-stuttering: true
+    fix-const-stuttering: false
     generate-samples: true
     generate-fakes: true
     head-as-boolean: true

From d88015129fb7afaaf40a1ddfbbfc8186e67340c0 Mon Sep 17 00:00:00 2001
From: Pan Shao <97225342+pshao25@users.noreply.github.com>
Date: Wed, 6 Aug 2025 14:22:37 +0800
Subject: [PATCH 15/34] Add github summary report (#36422)

* Add to github summary

* Add test file

* update

* update

* update

* test

* update

* update

* update

* update

---------

Co-authored-by: Pan Shao <pashao@microsoft.com>
---
 .../typespec-migration-validation.yaml        |  2 +-
 .../scripts/download-main.ps1                 | 12 +++++-----
 .../src/compare.ts                            |  4 +++-
 .../src/index.ts                              | 24 +++++++++++++++----
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/typespec-migration-validation.yaml b/.github/workflows/typespec-migration-validation.yaml
index 2536989fe082..f062d4a95aad 100644
--- a/.github/workflows/typespec-migration-validation.yaml
+++ b/.github/workflows/typespec-migration-validation.yaml
@@ -23,5 +23,5 @@ jobs:
 
       - name: Run TypeSpec Migration Validation
         run: |
-          ./eng/tools/typespec-migration-validation/scripts/download-main.ps1 -Verbose -callValidation $true
+          ./eng/tools/typespec-migration-validation/scripts/download-main.ps1 -Verbose -reportFile $env:GITHUB_STEP_SUMMARY
         shell: pwsh
diff --git a/eng/tools/typespec-migration-validation/scripts/download-main.ps1 b/eng/tools/typespec-migration-validation/scripts/download-main.ps1
index be60fe389cb4..0a7b1edcb220 100644
--- a/eng/tools/typespec-migration-validation/scripts/download-main.ps1
+++ b/eng/tools/typespec-migration-validation/scripts/download-main.ps1
@@ -1,6 +1,6 @@
 param(
   [string]$swaggerPath,
-  [string]$callValidation = $false
+  [string]$reportFile = $null
 )
 
 . $PSScriptRoot/../../../scripts/ChangedFiles-Functions.ps1
@@ -95,11 +95,11 @@ if ($swaggerPath.StartsWith("specification")) {
   $swaggerPath = Join-Path $repoRoot $swaggerPath
 }
 
-if ($callValidation -eq $true) {
-  Write-Host "Executing TypeSpec migration validation..."
-  npx tsmv $swaggerInMain $swaggerPath
+if ([string]::IsNullOrEmpty($reportFile)) {
+  Write-Host "Your next command: npx tsmv $swaggerInMain $swaggerPath --outputFolder {outputFolder}"
 }
-else {
-  Write-Host "Your next command: npx tsmv $swaggerInMain $swaggerPath {outputFolder}"
+else {  
+  Write-Host "Executing TypeSpec migration validation..."
+  npx tsmv $swaggerInMain $swaggerPath --reportFile $reportFile
 }
 
diff --git a/eng/tools/typespec-migration-validation/src/compare.ts b/eng/tools/typespec-migration-validation/src/compare.ts
index 4ba24e4587d5..07f818c305e7 100644
--- a/eng/tools/typespec-migration-validation/src/compare.ts
+++ b/eng/tools/typespec-migration-validation/src/compare.ts
@@ -46,7 +46,9 @@ function comparePaths(oldDocument: OpenAPI2Document, newDocument: OpenAPI2Docume
         level: "error"
       });
     }
-    pathDiffs.push(...compareOperation(oldOperations[operationId][1], newOperations[operationId][1], operationId));
+    else {
+      pathDiffs.push(...compareOperation(oldOperations[operationId][1], newOperations[operationId][1], operationId));
+    }    
   }
   for (const operationId in newOperations) {
     if (!oldOperations[operationId]) {
diff --git a/eng/tools/typespec-migration-validation/src/index.ts b/eng/tools/typespec-migration-validation/src/index.ts
index bed181f7fe63..f9e3ebb6c22d 100644
--- a/eng/tools/typespec-migration-validation/src/index.ts
+++ b/eng/tools/typespec-migration-validation/src/index.ts
@@ -19,6 +19,7 @@ import {
   formatModifiedValuesReport,
 } from "./summary.js";
 import { compareDocuments, printPathDiff } from "./compare.js";
+import { writeFile } from "fs/promises";
 
 function parseArguments() {
   return yargs(hideBin(process.argv))
@@ -50,6 +51,14 @@ function parseArguments() {
       "Compare two swagger specs",
     )
     .example("$0 oldSpecPath newSpecPath", "Compare using positional arguments")
+    .example(
+      "$0 --oldPath ./old-spec --newPath ./new-spec --reportFile ./custom-report.md",
+      "Compare specs with custom report file",
+    )
+    .example(
+      "$0 --oldPath ./old-spec --newPath ./new-spec --outputFolder ./validation-results",
+      "Compare specs with custom output folder",
+    )
     .example(
       "$0 add-ignore --path \"paths['/api/resource'].put.parameters[0].required__added\" --outputFolder ./results",
       "Add a path to ignore file",
@@ -68,6 +77,11 @@ function parseArguments() {
       alias: "out",
       describe: "Output folder for analysis results",
       type: "string",
+    })    
+    .option("reportFile", {
+      alias: "r",
+      describe: "Path to the report file",
+      type: "string",
     })
     .option("ignoreDescription", {
       description: "Ignore description differences",
@@ -95,9 +109,6 @@ function parseArguments() {
       if (!argv.newPath && positional.length > 1) {
         argv.newPath = positional[1]!.toString();
       }
-      if (!argv.outputFolder && positional.length > 2) {
-        argv.outputFolder = positional[2]!.toString();
-      }
 
       if (!argv.oldPath || !argv.newPath) {
         throw new Error("Both oldPath and newPath are required");
@@ -155,7 +166,7 @@ export async function main() {
 
   // If using add-ignore command, the command handler will exit the process
 
-  const { oldPath, newPath, outputFolder, ignoreDescription, ignorePathCase } = args;
+  const { oldPath, newPath, reportFile, outputFolder, ignoreDescription, ignorePathCase } = args;
   configuration.ignoreDescription = ignoreDescription;
   if (ignorePathCase !== undefined) {
     configuration.ignorePathCase = ignorePathCase;
@@ -261,7 +272,10 @@ export async function main() {
       );
     }
   }
-  else {
+  else if (reportFile) {
+    if (compareResult.length > 0) {
+      await writeFile(reportFile, outputMarkdown);
+    }
     if (compareResult.filter((x) => x.level === "error").length > 0) {
       logError("Differences found. Please fix the issues before proceeding.");
       process.exit(1);

From cee8b51dc487fd473e2214a32d8eb1083cdabd21 Mon Sep 17 00:00:00 2001
From: "Jiao Di (MSFT)" <80496810+v-jiaodi@users.noreply.github.com>
Date: Wed, 6 Aug 2025 14:46:35 +0800
Subject: [PATCH 16/34] Update data-plane tspconfig is-modular-library (#35728)

* update data-plane tspconfig is-modular-library

* update

* update

* update

* update

* Update tspconfig.yaml

* update tspconfig

---------

Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Co-authored-by: Qiaoqiao Zhang <55688292+qiaozha@users.noreply.github.com>
Co-authored-by: Mike Harder <mharder@microsoft.com>
---
 specification/ai/Azure.AI.Agents/tspconfig.yaml            | 7 ++++---
 specification/ai/DocumentIntelligence/tspconfig.yaml       | 1 +
 specification/ai/Face/tspconfig.yaml                       | 1 +
 .../HealthInsights.RadiologyInsights/tspconfig.yaml        | 1 +
 specification/ai/ImageAnalysis/tspconfig.yaml              | 1 +
 specification/apicenter/ApiCenter.DataApi/tspconfig.yaml   | 1 +
 .../appconfiguration/AppConfiguration/tspconfig.yaml       | 1 +
 .../ApplicationInsights.LiveMetrics/tspconfig.yaml         | 1 +
 specification/batch/Azure.Batch/tspconfig.yaml             | 1 +
 .../cognitiveservices/AnomalyDetector/tspconfig.yaml       | 1 +
 .../cognitiveservices/ContentSafety/tspconfig.yaml         | 1 +
 .../communication/Communication.JobRouter/tspconfig.yaml   | 1 +
 .../communication/Communication.Messages/tspconfig.yaml    | 1 +
 .../Microsoft.CodeTransparency/tspconfig.yaml              | 2 +-
 specification/devcenter/DevCenter/tspconfig.yaml           | 1 +
 .../HealthDataAIServices.DeidServices/tspconfig.yaml       | 1 +
 .../loadtestservice/LoadTestService/tspconfig.yaml         | 1 +
 specification/loadtestservice/Playwright/tspconfig.yaml    | 1 +
 .../machinelearningservices/AzureAI.Assets/tspconfig.yaml  | 1 +
 .../Azure.Analytics.OnlineExperimentation/tspconfig.yaml   | 1 +
 .../orbital/Microsoft.PlanetaryComputer/tspconfig.yaml     | 1 +
 .../PlaywrightTesting.AuthManager/tspconfig.yaml           | 1 +
 .../Azure.ProgrammableConnectivity/tspconfig.yaml          | 1 +
 .../purview/Azure.Analytics.Purview.DataMap/tspconfig.yaml | 1 +
 specification/riskiq/Easm/tspconfig.yaml                   | 1 +
 specification/schemaregistry/SchemaRegistry/tspconfig.yaml | 1 +
 .../Azure.AI.DocumentTranslation/tspconfig.yaml            | 1 +
 .../translation/Azure.AI.TextTranslation/tspconfig.yaml    | 1 +
 specification/trustedsigning/TrustedSigning/tspconfig.yaml | 1 +
 29 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/specification/ai/Azure.AI.Agents/tspconfig.yaml b/specification/ai/Azure.AI.Agents/tspconfig.yaml
index 2a947e04ed1a..fd27206b7475 100644
--- a/specification/ai/Azure.AI.Agents/tspconfig.yaml
+++ b/specification/ai/Azure.AI.Agents/tspconfig.yaml
@@ -35,10 +35,11 @@ options:
     model-namespace: false
     api-version: "2025-05-15-preview"
   "@azure-tools/typespec-ts":
+    package-dir: "ai-agents"
     api-version: "v1"
-    generateTest: true
-    generateMetadata: false
-    packageDetails:
+    generate-test: true
+    generate-metadata: false
+    package-details:
       name: "@azure/ai-agents"
     flavor: azure
 linter:
diff --git a/specification/ai/DocumentIntelligence/tspconfig.yaml b/specification/ai/DocumentIntelligence/tspconfig.yaml
index 7e8a6bfa2480..e4f7893743b1 100644
--- a/specification/ai/DocumentIntelligence/tspconfig.yaml
+++ b/specification/ai/DocumentIntelligence/tspconfig.yaml
@@ -55,6 +55,7 @@ options:
   "@azure-tools/typespec-ts":
     title: DocumentIntelligence
     package-dir: "ai-document-intelligence-rest"
+    is-modular-library: false
     generate-metadata: true
     package-details:
       name: "@azure-rest/ai-document-intelligence"
diff --git a/specification/ai/Face/tspconfig.yaml b/specification/ai/Face/tspconfig.yaml
index ad848f823699..c4e495d4f940 100644
--- a/specification/ai/Face/tspconfig.yaml
+++ b/specification/ai/Face/tspconfig.yaml
@@ -32,6 +32,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "ai-vision-face-rest"
     generate-metadata: true
+    is-modular-library: false
     flavor: azure
     package-details:
       name: "@azure-rest/ai-vision-face"
diff --git a/specification/ai/HealthInsights/HealthInsights.RadiologyInsights/tspconfig.yaml b/specification/ai/HealthInsights/HealthInsights.RadiologyInsights/tspconfig.yaml
index 040385536712..f62f73e90577 100644
--- a/specification/ai/HealthInsights/HealthInsights.RadiologyInsights/tspconfig.yaml
+++ b/specification/ai/HealthInsights/HealthInsights.RadiologyInsights/tspconfig.yaml
@@ -58,6 +58,7 @@ options:
     package-dir: "health-insights-radiologyinsights-rest"
     emitter-output-dir: "{js-sdk-folder}/sdk/{service-directory-name}/health-insights-cancerprofiling-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/health-insights-radiologyinsights"
     flavor: azure
diff --git a/specification/ai/ImageAnalysis/tspconfig.yaml b/specification/ai/ImageAnalysis/tspconfig.yaml
index 927167d792d6..bcc6f458c07b 100644
--- a/specification/ai/ImageAnalysis/tspconfig.yaml
+++ b/specification/ai/ImageAnalysis/tspconfig.yaml
@@ -38,6 +38,7 @@ options:
     flavor: azure
   "@azure-tools/typespec-ts":
     package-dir: "ai-vision-image-analysis-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/ai-vision-image-analysis"
     flavor: azure
diff --git a/specification/apicenter/ApiCenter.DataApi/tspconfig.yaml b/specification/apicenter/ApiCenter.DataApi/tspconfig.yaml
index 3a437cf5de1e..c9ae534b80b3 100644
--- a/specification/apicenter/ApiCenter.DataApi/tspconfig.yaml
+++ b/specification/apicenter/ApiCenter.DataApi/tspconfig.yaml
@@ -27,6 +27,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "azure-apicenter-rest"
     generate-metadata: true
+    is-modular-library: false
     flavor: azure
     package-details:
       name: "@azure-rest/azure-apicenter-rest"
diff --git a/specification/appconfiguration/AppConfiguration/tspconfig.yaml b/specification/appconfiguration/AppConfiguration/tspconfig.yaml
index 72115c369b2b..d582e38162fd 100644
--- a/specification/appconfiguration/AppConfiguration/tspconfig.yaml
+++ b/specification/appconfiguration/AppConfiguration/tspconfig.yaml
@@ -31,6 +31,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "azure-appconfiguration-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/azure-appconfiguration"
       description: "Azure App Configuration"
diff --git a/specification/applicationinsights/ApplicationInsights.LiveMetrics/tspconfig.yaml b/specification/applicationinsights/ApplicationInsights.LiveMetrics/tspconfig.yaml
index 3848644a809a..72b1d29fd853 100644
--- a/specification/applicationinsights/ApplicationInsights.LiveMetrics/tspconfig.yaml
+++ b/specification/applicationinsights/ApplicationInsights.LiveMetrics/tspconfig.yaml
@@ -28,6 +28,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "livemetrics-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/livemetrics"
       description: "LiveMetrics Service"
diff --git a/specification/batch/Azure.Batch/tspconfig.yaml b/specification/batch/Azure.Batch/tspconfig.yaml
index c751266b4d36..9e779ffd0963 100644
--- a/specification/batch/Azure.Batch/tspconfig.yaml
+++ b/specification/batch/Azure.Batch/tspconfig.yaml
@@ -50,6 +50,7 @@ options:
     generate-sample: false
   "@azure-tools/typespec-ts":
     package-dir: "batch-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/batch"
       description: "Batch Service Rest Level Client"
diff --git a/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml b/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml
index 423bd8f8bd70..be73e0f02aa4 100644
--- a/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml
+++ b/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml
@@ -40,6 +40,7 @@ options:
   "@azure-tools/typespec-ts":
     emitter-output-dir: "{js-sdk-folder}/sdk/{service-directory-name}/ai-anomaly-detector-rest"
     generate-metadata: true
+    is-modular-library: false
     package-dir: "ai-anomaly-detector-rest"
     package-details:
       name: "@azure-rest/ai-anomaly-detector"
diff --git a/specification/cognitiveservices/ContentSafety/tspconfig.yaml b/specification/cognitiveservices/ContentSafety/tspconfig.yaml
index 06d4d8534d1b..5224245abf0c 100644
--- a/specification/cognitiveservices/ContentSafety/tspconfig.yaml
+++ b/specification/cognitiveservices/ContentSafety/tspconfig.yaml
@@ -32,6 +32,7 @@ options:
     model-namespace: false
   "@azure-tools/typespec-ts":
     package-dir: "ai-content-safety-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/ai-content-safety"
       version: "1.0.0"
diff --git a/specification/communication/Communication.JobRouter/tspconfig.yaml b/specification/communication/Communication.JobRouter/tspconfig.yaml
index e4a89978db93..f92d79a33e8a 100644
--- a/specification/communication/Communication.JobRouter/tspconfig.yaml
+++ b/specification/communication/Communication.JobRouter/tspconfig.yaml
@@ -60,6 +60,7 @@ options:
   "@azure-tools/typespec-ts":
     emitter-output-dir: "{js-sdk-folder}/sdk/{service-directory-name}/communication-job-router-rest"
     package-dir: "communication-job-router-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/communication-job-router"
       description: "Azure client library for Azure Communication Job Router services"
diff --git a/specification/communication/Communication.Messages/tspconfig.yaml b/specification/communication/Communication.Messages/tspconfig.yaml
index 916c414a50e7..46b11cd1d2c7 100644
--- a/specification/communication/Communication.Messages/tspconfig.yaml
+++ b/specification/communication/Communication.Messages/tspconfig.yaml
@@ -58,6 +58,7 @@ options:
     flavor: azure
   "@azure-tools/typespec-ts":
     package-dir: "communication-messages-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/communication-messages"
       description: "Azure client library for Azure Communication Messages services"
diff --git a/specification/confidentialledger/Microsoft.CodeTransparency/tspconfig.yaml b/specification/confidentialledger/Microsoft.CodeTransparency/tspconfig.yaml
index 890c5b7fd516..cc4c1a00982a 100644
--- a/specification/confidentialledger/Microsoft.CodeTransparency/tspconfig.yaml
+++ b/specification/confidentialledger/Microsoft.CodeTransparency/tspconfig.yaml
@@ -17,7 +17,6 @@ options:
     namespace: "azure.codetransparency"
     package-mode: "dataplane"
     package-pprint-name: "Code Transparency Service"
-    models-mode: none
     generate-test: true
     generate-sample: true
   "@azure-tools/typespec-csharp":
@@ -32,6 +31,7 @@ options:
   "@azure-tools/typespec-ts":
     flavor: azure
     package-dir: "codetransparency-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/codetransparency"
       description: "Code Transparency Service"
diff --git a/specification/devcenter/DevCenter/tspconfig.yaml b/specification/devcenter/DevCenter/tspconfig.yaml
index 98429b622047..04b31081bbf9 100644
--- a/specification/devcenter/DevCenter/tspconfig.yaml
+++ b/specification/devcenter/DevCenter/tspconfig.yaml
@@ -33,6 +33,7 @@ options:
     title: "Azure Developer DevCenter"
     package-dir: "developer-devcenter-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/developer-devcenter"
       description: "Azure Developer DevCenter Client"
diff --git a/specification/healthdataaiservices/HealthDataAIServices.DeidServices/tspconfig.yaml b/specification/healthdataaiservices/HealthDataAIServices.DeidServices/tspconfig.yaml
index 3b684fc2a988..ea5cc52a3fa9 100644
--- a/specification/healthdataaiservices/HealthDataAIServices.DeidServices/tspconfig.yaml
+++ b/specification/healthdataaiservices/HealthDataAIServices.DeidServices/tspconfig.yaml
@@ -31,6 +31,7 @@ options:
     package-dir: "health-deidentification-rest"
     title: DeidentificationClient
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/health-deidentification"
       description: "Health Deidentification Service"
diff --git a/specification/loadtestservice/LoadTestService/tspconfig.yaml b/specification/loadtestservice/LoadTestService/tspconfig.yaml
index cf69d1bb8a02..0f45f3d8d01d 100644
--- a/specification/loadtestservice/LoadTestService/tspconfig.yaml
+++ b/specification/loadtestservice/LoadTestService/tspconfig.yaml
@@ -40,6 +40,7 @@ options:
     title: Azure Load Testing
     description: Azure Load Testing Client
     generate-metadata: true
+    is-modular-library: false
     generate-test: false
     package-details:
       name: "@azure-rest/load-testing"
diff --git a/specification/loadtestservice/Playwright/tspconfig.yaml b/specification/loadtestservice/Playwright/tspconfig.yaml
index fb3513f7c642..cbf3dbb8024c 100644
--- a/specification/loadtestservice/Playwright/tspconfig.yaml
+++ b/specification/loadtestservice/Playwright/tspconfig.yaml
@@ -28,6 +28,7 @@ options:
     title: PlaywrightServiceClient
     description: Microsoft Playwright Service Client
     generate-metadata: true
+    is-modular-library: false
     generate-test: false
     package-details:
       name: "@azure-rest/playwright"
diff --git a/specification/machinelearningservices/AzureAI.Assets/tspconfig.yaml b/specification/machinelearningservices/AzureAI.Assets/tspconfig.yaml
index e731b72c83aa..c306e994007f 100644
--- a/specification/machinelearningservices/AzureAI.Assets/tspconfig.yaml
+++ b/specification/machinelearningservices/AzureAI.Assets/tspconfig.yaml
@@ -18,6 +18,7 @@ options:
     generate-sample: true
   "@azure-tools/typespec-ts":
     generate-metadata: true
+    is-modular-library: false
     package-dir: "ai-resources-autogen-rest"
     package-details:
       name: "@azure-rest/ai-resources-autogen"
diff --git a/specification/onlineexperimentation/Azure.Analytics.OnlineExperimentation/tspconfig.yaml b/specification/onlineexperimentation/Azure.Analytics.OnlineExperimentation/tspconfig.yaml
index fc8417de86f9..d2903073ae3e 100644
--- a/specification/onlineexperimentation/Azure.Analytics.OnlineExperimentation/tspconfig.yaml
+++ b/specification/onlineexperimentation/Azure.Analytics.OnlineExperimentation/tspconfig.yaml
@@ -47,6 +47,7 @@ options:
     model-namespace: false
   "@azure-tools/typespec-ts":
     package-dir: "onlineexperimentation-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/onlineexperimentation"
       description: "Azure Online Experimentation Service"
diff --git a/specification/orbital/Microsoft.PlanetaryComputer/tspconfig.yaml b/specification/orbital/Microsoft.PlanetaryComputer/tspconfig.yaml
index 85666d68cea8..7933115c2aa9 100644
--- a/specification/orbital/Microsoft.PlanetaryComputer/tspconfig.yaml
+++ b/specification/orbital/Microsoft.PlanetaryComputer/tspconfig.yaml
@@ -27,6 +27,7 @@ options:
   #   flavor: azure
   # "@azure-tools/typespec-ts":
   #   package-dir: "planetarycomputer-rest"
+  #   is-modular-library: false
   #   package-details:
   #     name: "@azure-rest/planetarycomputer-rest"
   #   flavor: azure
diff --git a/specification/playwrighttesting/PlaywrightTesting.AuthManager/tspconfig.yaml b/specification/playwrighttesting/PlaywrightTesting.AuthManager/tspconfig.yaml
index 2692a75efb54..f0796edd5608 100644
--- a/specification/playwrighttesting/PlaywrightTesting.AuthManager/tspconfig.yaml
+++ b/specification/playwrighttesting/PlaywrightTesting.AuthManager/tspconfig.yaml
@@ -24,6 +24,7 @@ options:
     title: Microsoft Playwright Testing
     description: Microsoft Playwright Testing Client
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/microsoft-playwright-testing"
       description: "This package contains Microsoft Playwright Testing client library."
diff --git a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/tspconfig.yaml b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/tspconfig.yaml
index ebd4a89aa96d..45aed741e7fb 100644
--- a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/tspconfig.yaml
+++ b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/tspconfig.yaml
@@ -29,6 +29,7 @@ options:
     generate-sample: true
   "@azure-tools/typespec-ts":
     generate-metadata: true
+    is-modular-library: false
     package-dir: "programmableconnectivity-rest"
     package-details:
       name: "@azure-rest/programmableconnectivity"
diff --git a/specification/purview/Azure.Analytics.Purview.DataMap/tspconfig.yaml b/specification/purview/Azure.Analytics.Purview.DataMap/tspconfig.yaml
index 331a9efb32e6..0e569b94f98b 100644
--- a/specification/purview/Azure.Analytics.Purview.DataMap/tspconfig.yaml
+++ b/specification/purview/Azure.Analytics.Purview.DataMap/tspconfig.yaml
@@ -31,6 +31,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "purview-datamap-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/purview-datamap"
       description: Purview DataMap Service"
diff --git a/specification/riskiq/Easm/tspconfig.yaml b/specification/riskiq/Easm/tspconfig.yaml
index 75cf9bef3dec..a1a1a64113a8 100644
--- a/specification/riskiq/Easm/tspconfig.yaml
+++ b/specification/riskiq/Easm/tspconfig.yaml
@@ -25,6 +25,7 @@ options:
     model-namespace: false
   "@azure-tools/typespec-ts":
     package-dir: "defendereasm-rest"
+    is-modular-library: false
     package-details:
       name: "@azure-rest/defender-easm-rest"
     flavor: azure
diff --git a/specification/schemaregistry/SchemaRegistry/tspconfig.yaml b/specification/schemaregistry/SchemaRegistry/tspconfig.yaml
index ddd0289450c0..7f1ae3e3348b 100644
--- a/specification/schemaregistry/SchemaRegistry/tspconfig.yaml
+++ b/specification/schemaregistry/SchemaRegistry/tspconfig.yaml
@@ -30,6 +30,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "schema-registry"
     generate-metadata: false
+    is-modular-library: false
     package-details:
       name: "@azure/schema-registry"
     flavor: azure
diff --git a/specification/translation/Azure.AI.DocumentTranslation/tspconfig.yaml b/specification/translation/Azure.AI.DocumentTranslation/tspconfig.yaml
index 04c4461cdd44..5ae477aa9ec2 100644
--- a/specification/translation/Azure.AI.DocumentTranslation/tspconfig.yaml
+++ b/specification/translation/Azure.AI.DocumentTranslation/tspconfig.yaml
@@ -45,6 +45,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "ai-translation-document-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/ai-translation-document"
       description: "Microsoft Translation Document"
diff --git a/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml b/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml
index d0d62b6a1c87..f7bdad021caa 100644
--- a/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml
+++ b/specification/translation/Azure.AI.TextTranslation/tspconfig.yaml
@@ -42,6 +42,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "ai-translation-text-rest"
     generate-metadata: false
+    is-modular-library: false
     package-details:
       name: "@azure-rest/ai-translation-text"
       description: "Microsoft Translation Text"
diff --git a/specification/trustedsigning/TrustedSigning/tspconfig.yaml b/specification/trustedsigning/TrustedSigning/tspconfig.yaml
index a18adfcdc4cc..361651b37022 100644
--- a/specification/trustedsigning/TrustedSigning/tspconfig.yaml
+++ b/specification/trustedsigning/TrustedSigning/tspconfig.yaml
@@ -31,6 +31,7 @@ options:
   "@azure-tools/typespec-ts":
     package-dir: "developer-trustedsigning-rest"
     generate-metadata: true
+    is-modular-library: false
     package-details:
       name: "@azure-rest/developer-trustedsigning"
       description: "Azure trusted signing service"

From 457a3dc25ce6f949465efbf72fe728f854bf0bf4 Mon Sep 17 00:00:00 2001
From: Xinni Tong <v-xinnitong@microsoft.com>
Date: Wed, 6 Aug 2025 17:50:46 +0800
Subject: [PATCH 17/34] Add conditions to trigger TypeSpec Migration Validation
 (#36482)

---
 .github/workflows/typespec-migration-validation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/typespec-migration-validation.yaml b/.github/workflows/typespec-migration-validation.yaml
index f062d4a95aad..fa40fc303303 100644
--- a/.github/workflows/typespec-migration-validation.yaml
+++ b/.github/workflows/typespec-migration-validation.yaml
@@ -10,7 +10,7 @@ permissions:
 jobs:
   typespec-migration-validation:
     name: TypeSpec Migration Validation
-    if: contains(github.event.pull_request.labels.*.name, 'typespec-conversion-w1') || contains(github.event.pull_request.labels.*.name, 'typespec-conversion-w2')
+    if: contains(github.event.pull_request.labels.*.name, 'typespec-conversion-w1') || contains(github.event.pull_request.labels.*.name, 'typespec-conversion-w2') || contains(github.event.pull_request.labels.*.name, 'typespec-conversion-w3')
     runs-on: ubuntu-24.04
 
     steps:

From fd14567eb14a86aaf4652d789e6745480092b053 Mon Sep 17 00:00:00 2001
From: Arthur Ma <mars.arthur@263.net>
Date: Wed, 6 Aug 2025 21:41:53 +0800
Subject: [PATCH 18/34] Update the Nginx Typespec (#36473)

---
 .../nginx/Nginx.Management/ApiKeys.tsp        |    6 +-
 .../nginx/Nginx.Management/Certificates.tsp   |    8 +-
 .../nginx/Nginx.Management/Configurations.tsp |   12 +-
 .../Nginx.Management/NginxDeployments.tsp     |   17 +-
 .../nginx/Nginx.Management/WafPolicies.tsp    |    2 +-
 .../nginx/Nginx.Management/client.tsp         |   86 +-
 ...ApiKeys_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../ApiKeys_Delete_MaximumSet_Gen.json        |    2 +-
 .../ApiKeys_Get_MaximumSet_Gen.json           |    4 +-
 ...iKeys_ListByDeployment_MaximumSet_Gen.json |    4 +-
 ...ficates_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Certificates_Delete_MaximumSet_Gen.json   |    2 +-
 .../Certificates_Get_MaximumSet_Gen.json      |    4 +-
 ...cates_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Certificates_Update_MaximumSet_Gen.json   |    4 +-
 .../Configurations_Analyze.json               |    4 +-
 ...rations_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Configurations_Delete_MaximumSet_Gen.json |    2 +-
 .../Configurations_Get_MaximumSet_Gen.json    |    4 +-
 ...tions_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Configurations_Update_MaximumSet_Gen.json |    4 +-
 ...oyments_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 ...ginxDeployments_Delete_MaximumSet_Gen.json |    2 +-
 .../NginxDeployments_Get_MaximumSet_Gen.json  |    4 +-
 ...ts_ListByResourceGroup_MaximumSet_Gen.json |    2 +-
 ...nts_ListBySubscription_MaximumSet_Gen.json |    2 +-
 ...ListDefaultWafPolicies_MaximumSet_Gen.json |    2 +-
 ...ginxDeployments_Update_MaximumSet_Gen.json |    4 +-
 ...olicies_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../WafPolicies_Delete_MaximumSet_Gen.json    |    2 +-
 .../WafPolicies_Get_MaximumSet_Gen.json       |    4 +-
 ...icies_ListByDeployment_MaximumSet_Gen.json |    4 +-
 specification/nginx/Nginx.Management/main.tsp |    2 +-
 .../nginx/Nginx.Management/tspconfig.yaml     |    8 +-
 specification/nginx/cspell.yaml               |    2 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    6 +-
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    6 +-
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    6 +-
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../examples/Operations_List.json             |    0
 .../preview/2021-05-01-preview/swagger.json   |   37 -
 .../examples/Certificates_CreateOrUpdate.json |   44 +
 .../examples/Certificates_Delete.json         |   18 +
 .../examples/Certificates_Get.json            |   24 +
 .../examples/Certificates_List.json           |   38 +
 .../Configurations_CreateOrUpdate.json        |   65 +
 .../examples/Configurations_Delete.json       |   18 +
 .../examples/Configurations_Get.json          |   31 +
 .../examples/Configurations_List.json         |   34 +
 .../examples/Deployments_Create.json          |  111 ++
 .../examples/Deployments_Delete.json          |   17 +
 .../examples/Deployments_Get.json             |   42 +
 .../examples/Deployments_List.json            |   45 +
 .../Deployments_ListByResourceGroup.json      |   46 +
 .../examples/Deployments_Update.json          |   86 ++
 .../examples/Operations_List.json             |   23 +
 .../preview/2022-11-01-preview}/swagger.json  |   26 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    2 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../examples/Operations_List.json             |    0
 .../preview/2024-01-01-preview/swagger.json   |   50 +-
 .../examples/Certificates_CreateOrUpdate.json |    4 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    0
 .../Configurations_CreateOrUpdate.json        |    0
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    0
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    0
 .../examples/Operations_List.json             |    0
 .../preview/2024-06-01-preview/swagger.json   |   78 +-
 .../examples/ApiKeys_CreateOrUpdate.json      |    4 +-
 .../examples/ApiKeys_Delete.json              |    0
 .../examples/ApiKeys_Get.json                 |    0
 .../examples/ApiKeys_List.json                |    0
 .../examples/Certificates_CreateOrUpdate.json |    4 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    0
 .../Configurations_CreateOrUpdate.json        |    0
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    0
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    0
 .../examples/Operations_List.json             |    0
 .../preview/2024-09-01-preview/swagger.json   |   80 +-
 .../examples/ApiKeys_CreateOrUpdate.json      |    4 +-
 .../examples/ApiKeys_Delete.json              |    0
 .../examples/ApiKeys_Get.json                 |    0
 .../examples/ApiKeys_List.json                |    0
 .../examples/Certificates_CreateOrUpdate.json |    4 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    0
 .../Configurations_CreateOrUpdate.json        |    0
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    0
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    0
 .../examples/Deployments_UpdateSubnet.json    |    0
 .../examples/Operations_List.json             |    0
 .../preview/2024-11-01-preview/swagger.json   |   88 +-
 ...ApiKeys_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../ApiKeys_Delete_MaximumSet_Gen.json        |    2 +-
 .../examples/ApiKeys_Get_MaximumSet_Gen.json  |    4 +-
 ...iKeys_ListByDeployment_MaximumSet_Gen.json |    4 +-
 ...ficates_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Certificates_Delete_MaximumSet_Gen.json   |    2 +-
 .../Certificates_Get_MaximumSet_Gen.json      |    4 +-
 ...cates_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Certificates_Update_MaximumSet_Gen.json   |    4 +-
 .../examples/Configurations_Analyze.json      |    4 +-
 ...rations_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Configurations_Delete_MaximumSet_Gen.json |    2 +-
 .../Configurations_Get_MaximumSet_Gen.json    |    4 +-
 ...tions_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Configurations_Update_MaximumSet_Gen.json |    4 +-
 ...oyments_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 ...ginxDeployments_Delete_MaximumSet_Gen.json |    2 +-
 .../NginxDeployments_Get_MaximumSet_Gen.json  |    4 +-
 ...ts_ListByResourceGroup_MaximumSet_Gen.json |    2 +-
 ...nts_ListBySubscription_MaximumSet_Gen.json |    2 +-
 ...ListDefaultWafPolicies_MaximumSet_Gen.json |    2 +-
 ...ginxDeployments_Update_MaximumSet_Gen.json |    4 +-
 .../Operations_List_MaximumSet_Gen.json       |    0
 .../Operations_List_MinimumSet_Gen.json       |    0
 ...olicies_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../WafPolicies_Delete_MaximumSet_Gen.json    |    2 +-
 .../WafPolicies_Get_MaximumSet_Gen.json       |    4 +-
 ...icies_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../preview/2025-03-01-preview/openapi.json   |  111 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    6 +-
 .../2022-08-01/examples/Certificates_Get.json |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    6 +-
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    6 +-
 .../2022-08-01/examples/Deployments_Get.json  |    0
 .../2022-08-01/examples/Deployments_List.json |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../2022-08-01/examples/Operations_List.json  |    0
 .../stable/2022-08-01/swagger.json            | 1333 +++++++++++++++++
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    0
 .../2023-04-01/examples/Certificates_Get.json |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    0
 .../2023-04-01/examples/Deployments_Get.json  |    0
 .../2023-04-01/examples/Deployments_List.json |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../2023-04-01/examples/Operations_List.json  |    0
 .../stable/2023-04-01/swagger.json            |   38 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    0
 .../2023-09-01/examples/Certificates_Get.json |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    2 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    0
 .../2023-09-01/examples/Deployments_Get.json  |    0
 .../2023-09-01/examples/Deployments_List.json |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../2023-09-01/examples/Operations_List.json  |    0
 .../stable/2023-09-01/swagger.json            |   50 +-
 .../nginx/resource-manager/readme.md          |   78 +-
 227 files changed, 2591 insertions(+), 527 deletions(-)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Certificates_Delete.json (72%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Certificates_Get.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Certificates_List.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Configurations_Delete.json (72%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Deployments_Delete.json (69%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2021-05-01-preview/swagger.json (95%)
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS/stable/2022-08-01 => Nginx.NginxPlus/preview/2022-11-01-preview}/swagger.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Configurations_Analysis.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-01-01-preview/swagger.json (96%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Configurations_Analysis.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_Create.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Deployments_Update.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-06-01-preview/swagger.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json (89%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/ApiKeys_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/ApiKeys_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/ApiKeys_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Configurations_Analysis.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_Create.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Deployments_Update.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-09-01-preview/swagger.json (96%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json (89%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/ApiKeys_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/ApiKeys_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/ApiKeys_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Configurations_Analysis.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_Create.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_Update.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2024-11-01-preview/swagger.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json (90%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Configurations_Analyze.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json (97%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/preview/2025-03-01-preview/openapi.json (97%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Certificates_Delete.json (71%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Certificates_Get.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Certificates_List.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Configurations_Delete.json (71%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Deployments_Delete.json (69%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2022-08-01/examples/Operations_List.json (100%)
 create mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Certificates_Get.json (92%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Certificates_List.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-04-01/swagger.json (97%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Configurations_Analysis.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{NGINX.NGINXPLUS => Nginx.NginxPlus}/stable/2023-09-01/swagger.json (96%)

diff --git a/specification/nginx/Nginx.Management/ApiKeys.tsp b/specification/nginx/Nginx.Management/ApiKeys.tsp
index 3bd2e247daf7..3b459577eb0d 100644
--- a/specification/nginx/Nginx.Management/ApiKeys.tsp
+++ b/specification/nginx/Nginx.Management/ApiKeys.tsp
@@ -7,7 +7,7 @@ using Rest;
 using Http;
 using Azure.ResourceManager;
 
-namespace NGINX.NGINXPLUS;
+namespace Nginx.NginxPlus;
 
 /**
  * API key resource returned by the service.
@@ -44,7 +44,7 @@ model ApiKeyResponseProperties {
   /**
    * Expiry of the key in UTC date-time format.
    */
-  endDateTime: string;
+  endDateTime?: string;
 }
 
 /**
@@ -61,7 +61,7 @@ model ApiKeyRequestProperties {
   /**
    * Expiry of the key in UTC date-time format.
    */
-  endDateTime: string;
+  endDateTime?: string;
 }
 
 /**
diff --git a/specification/nginx/Nginx.Management/Certificates.tsp b/specification/nginx/Nginx.Management/Certificates.tsp
index e37abedc8a51..8915470bcdec 100644
--- a/specification/nginx/Nginx.Management/Certificates.tsp
+++ b/specification/nginx/Nginx.Management/Certificates.tsp
@@ -6,12 +6,16 @@ import "@azure-tools/typespec-azure-resource-manager";
 using Rest;
 using Azure.ResourceManager;
 
-namespace NGINX.NGINXPLUS;
+namespace Nginx.NginxPlus;
 
 /** NginxCertificate resource */
 @parentResource(NginxDeployment)
 model Certificate is ProxyResource<NginxCertificateProperties> {
   ...ResourceNameParameter<Certificate>;
+
+  /** Gets or sets the location. */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property"
+  location?: string;
 }
 
 /**
@@ -37,7 +41,7 @@ model NginxCertificateProperties {
   /**
    * The Key Vault secret ID. Example: `https://myvault.vault.azure.net/secrets/mysecret/1234567890abcdef1234567890abcdef`.
    */
-  keyVaultSecretId?: url;
+  keyVaultSecretId?: string;
 
   /**
    * The SHA1 thumbprint of the certificate.
diff --git a/specification/nginx/Nginx.Management/Configurations.tsp b/specification/nginx/Nginx.Management/Configurations.tsp
index 0bd79a9e9113..15dbacbfcbaf 100644
--- a/specification/nginx/Nginx.Management/Configurations.tsp
+++ b/specification/nginx/Nginx.Management/Configurations.tsp
@@ -7,7 +7,7 @@ using Rest;
 using Http;
 using Azure.ResourceManager;
 
-namespace NGINX.NGINXPLUS;
+namespace Nginx.NginxPlus;
 
 /**
  * Represents an Nginx configuration resource.
@@ -160,9 +160,9 @@ model NginxConfigurationRequestProperties {
 }
 
 /**
- * The request body for creating an analysis for an NGINX configuration.
+ * The request body for creating an analysis for an Nginx configuration.
  */
-@doc("The request body for creating an analysis for an NGINX configuration.")
+@doc("The request body for creating an analysis for an Nginx configuration.")
 model AnalysisCreate {
   /**
    * Configuration details for analysis.
@@ -175,7 +175,7 @@ model AnalysisCreate {
  */
 model AnalysisConfig {
   /**
-   * The root file of the NGINX config file(s). It must match one of the files' filepath.
+   * The root file of the Nginx config file(s). It must match one of the files' filepath.
    */
   rootFile?: string;
 
@@ -228,7 +228,7 @@ model AnalysisResultContent {
 }
 
 /**
- * An error object found during the analysis of an NGINX configuration.
+ * An error object found during the analysis of an Nginx configuration.
  */
 model AnalysisDiagnostic {
   /**
@@ -268,7 +268,7 @@ model AnalysisDiagnostic {
 }
 
 /**
- * A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.
+ * A diagnostic is a message associated with an Nginx config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.
  */
 model DiagnosticItem {
   /**
diff --git a/specification/nginx/Nginx.Management/NginxDeployments.tsp b/specification/nginx/Nginx.Management/NginxDeployments.tsp
index 577c24377c0a..0d11a671163d 100644
--- a/specification/nginx/Nginx.Management/NginxDeployments.tsp
+++ b/specification/nginx/Nginx.Management/NginxDeployments.tsp
@@ -7,20 +7,29 @@ using Rest;
 using Http;
 using Azure.ResourceManager;
 
-namespace NGINX.NGINXPLUS;
+namespace Nginx.NginxPlus;
 
 /**
  * Represents an Nginx deployment resource.
  */
-model NginxDeployment is TrackedResource<NginxDeploymentProperties> {
+#suppress "@azure-tools/typespec-azure-core/no-private-usage"
+#suppress "@azure-tools/typespec-azure-core/composition-over-inheritance"
+@Azure.ResourceManager.Private.armResourceInternal(NginxDeploymentProperties)
+@TypeSpec.Http.Private.includeInapplicableMetadataInPayload(false)
+model NginxDeployment extends Foundations.TrackedResource {
   /** The name of the Nginx deployment resource. */
   @pattern("^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$")
-  @key("nginxDeploymentName")
+  @key("deploymentName")
   @segment("nginxDeployments")
   @path
   name: string;
 
   ...ManagedServiceIdentityProperty;
+
+  /** The resource-specific properties for this resource. */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property"
+  properties?: NginxDeploymentProperties;
+
   ...ResourceSkuProperty;
 }
 
@@ -168,7 +177,7 @@ model NginxDeploymentProperties {
   /**
    * Whether diagnostics support is enabled.
    */
-  enableDiagnosticsSupport: boolean;
+  enableDiagnosticsSupport?: boolean;
 
   /**
    * Logging configuration.
diff --git a/specification/nginx/Nginx.Management/WafPolicies.tsp b/specification/nginx/Nginx.Management/WafPolicies.tsp
index 1ec394bdaea3..165c36cc9656 100644
--- a/specification/nginx/Nginx.Management/WafPolicies.tsp
+++ b/specification/nginx/Nginx.Management/WafPolicies.tsp
@@ -6,7 +6,7 @@ import "@azure-tools/typespec-azure-resource-manager";
 using Rest;
 using Azure.ResourceManager;
 
-namespace NGINX.NGINXPLUS;
+namespace Nginx.NginxPlus;
 
 /**
  * Represents a WAF policy resource under a given Nginx deployment.
diff --git a/specification/nginx/Nginx.Management/client.tsp b/specification/nginx/Nginx.Management/client.tsp
index 73e45c8205df..8a54e1cafccb 100644
--- a/specification/nginx/Nginx.Management/client.tsp
+++ b/specification/nginx/Nginx.Management/client.tsp
@@ -2,26 +2,24 @@ import "./main.tsp";
 import "@azure-tools/typespec-client-generator-core";
 
 using Azure.ClientGenerator.Core;
-using NGINX.NGINXPLUS;
+using Nginx.NginxPlus;
 
-@@clientName(NGINX.NGINXPLUS, "NginxManagementClient", "javascript");
-
-// Method name overrides
-@@clientName(Configurations.analyze, "analysis", "!csharp");
+@@clientName(Nginx.NginxPlus, "NginxManagementClient", "javascript");
 
 // Model name overrides
-@@clientName(Certificate, "NginxCertificate", "!csharp");
-@@clientName(ApiKey, "NginxDeploymentApiKeyResponse", "!csharp");
+@@clientName(Certificate, "NginxCertificate");
+@@clientName(ApiKeyRequestProperties, "NginxDeploymentApiKeyRequestProperties");
+
 @@clientName(ApiKeyResponseProperties,
   "NginxDeploymentApiKeyResponseProperties",
   "!csharp"
 );
+@@clientName(ApiKey, "NginxDeploymentApiKeyResponse", "!csharp");
 @@clientName(ApiKeyRequest, "NginxDeploymentApiKeyRequest", "!csharp");
-@@clientName(ApiKeyRequestProperties,
-  "NginxDeploymentApiKeyRequestProperties",
-  "!csharp"
-);
+@@clientName(AnalysisConfig, "AnalysisCreateConfig", "!csharp");
+@@clientName(AnalysisResultContent, "AnalysisResultData", "!csharp");
 @@clientName(Configuration, "NginxConfigurationResponse", "!csharp");
+@@clientName(DiagnosticLevel, "Level", "!csharp");
 @@clientName(NginxConfigurationProtectedFileResult,
   "NginxConfigurationProtectedFileResponse",
   "!csharp"
@@ -30,9 +28,6 @@ using NGINX.NGINXPLUS;
   "NginxConfigurationProtectedFileRequest",
   "!csharp"
 );
-@@clientName(AnalysisConfig, "AnalysisCreateConfig", "!csharp");
-@@clientName(AnalysisResultContent, "AnalysisResultData", "!csharp");
-@@clientName(DiagnosticLevel, "Level", "!csharp");
 
 // CommonTypes
 @@clientName(Azure.ResourceManager.CommonTypes.ManagedServiceIdentity,
@@ -49,7 +44,6 @@ using NGINX.NGINXPLUS;
 );
 // Sku has many more properties than ResourceSku
 @@clientName(Azure.ResourceManager.CommonTypes.Sku, "ResourceSku", "!csharp");
-
 // Anonymous model named by m4
 @@clientName(NginxAppProtect,
   "NginxDeploymentPropertiesNginxAppProtect",
@@ -75,6 +69,8 @@ using NGINX.NGINXPLUS;
   "!csharp"
 );
 
+// Method name overrides
+@@clientName(Configurations.analyze, "analysis", "!csharp");
 // Client name for list operations
 @@clientName(NginxDeployments.listBySubscription, "list", "!csharp");
 @@clientName(ApiKeys.listByDeployment, "list", "!csharp");
@@ -114,3 +110,63 @@ using NGINX.NGINXPLUS;
   "privateIpAllocationMethod",
   "java"
 );
+
+@@alternateType(Certificate.location, Azure.Core.azureLocation, "csharp");
+@@alternateType(NginxNetworkInterfaceConfiguration.subnetId,
+  Azure.Core.armResourceIdentifier,
+  "csharp"
+);
+@@alternateType(NginxPrivateIPAddress.privateIPAddress,
+  Azure.Core.ipV4Address,
+  "csharp"
+);
+@@alternateType(NginxPrivateIPAddress.subnetId,
+  Azure.Core.armResourceIdentifier,
+  "csharp"
+);
+@@alternateType(NginxCertificateProperties.keyVaultSecretCreated,
+  utcDateTime,
+  "csharp"
+);
+@@alternateType(ApiKeyResponseProperties.endDateTime, utcDateTime, "csharp");
+@@alternateType(ApiKeyRequestProperties.endDateTime, utcDateTime, "csharp");
+@@clientName(ApiKeyResponseProperties,
+  "NginxDeploymentApiKeyProperties",
+  "csharp"
+);
+@@clientName(AnalysisCreate, "NginxAnalysisContent", "csharp");
+@@clientName(AnalysisConfig, "NginxAnalysisConfig", "csharp");
+@@clientName(NginxCertificateErrorResponseBody,
+  "NginxCertificateError",
+  "csharp"
+);
+@@clientName(ActivationState, "NginxWafActivationState", "csharp");
+@@clientName(AnalysisResultContent, "NginxAnalysisResultDetails", "csharp");
+@@clientName(DiagnosticLevel, "NginxDiagnosticLevel", "csharp");
+@@clientName(Configuration, "NginxConfiguration", "csharp");
+@@clientName(NginxConfigurationResponseProperties,
+  "NginxConfigurationProperties",
+  "csharp"
+);
+@@clientName(ApiKey, "NginxDeploymentApiKey", "csharp");
+@@clientName(NginxConfigurationRequestProperties,
+  "NginxConfigurationCreateOrUpdateProperties",
+  "csharp"
+);
+
+@@clientName(AnalysisResult, "NginxAnalysisResult", "csharp");
+@@clientName(WafPolicy, "NginxDeploymentWafPolicy", "csharp");
+@@clientName(AnalysisDiagnostic, "NginxAnalysisDiagnostic", "csharp");
+@@clientName(DiagnosticItem, "NginxDiagnosticItem", "csharp");
+@@clientName(ProvisioningState, "NginxProvisioningState", "csharp");
+@@clientName(AutoScaleSettings, "NginxDeploymentAutoScaleSettings", "csharp");
+@@clientName(AutoUpgradeProfile, "NginxDeploymentAutoUpgradeProfile", "csharp");
+@@clientName(ScaleProfile, "NginxScaleProfile", "csharp");
+@@clientName(ScaleProfileCapacity, "NginxScaleProfileCapacity", "csharp");
+@@clientName(WebApplicationFirewallSettings, "NginxWafSettings", "csharp");
+@@clientName(WebApplicationFirewallStatus, "NginxWafStatus", "csharp");
+@@clientName(WebApplicationFirewallPackage, "NginxWafPackage", "csharp");
+@@clientName(WebApplicationFirewallComponentVersions,
+  "NginxWafComponentVersions",
+  "csharp"
+);
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
index 757676f0aeb2..f2be78b61b3b 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "apiKeyName": "myApiKey",
     "resource": {
       "properties": {
@@ -21,7 +21,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
@@ -40,7 +40,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json
index 5ac2423187d2..64a5ac53e7c5 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json
index 81448b2fcd57..9d653a0c46aa 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
@@ -15,7 +15,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json
index 7b47487b1fba..f1c9809b6214 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -16,7 +16,7 @@
               "hint": "my secret API key hint",
               "endDateTime": "2025-05-28T20:01:03.647Z"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
             "name": "otvmugiwezqyit",
             "type": "ugslayxowhvlfgkfldbnbulh",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json
index 31df5ccfa883..7ec5029b64cb 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "resource": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
@@ -69,7 +69,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json
index 040deb691f5c..3fef6b053060 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json
index ecc3b3fa376f..a031ed171dc4 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
@@ -24,7 +24,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json
index 423277a8086c..414257fe0c63 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -25,7 +25,7 @@
                 "message": "wqvmvmvchwavboxzhrhne"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/gr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/gr",
             "name": "gr",
             "type": "moqybsvacvokh",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json
index 0e4a7a4eee88..6ba94c2ff9a9 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "properties": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json
index abdc08cb82a6..76c564d38506 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json
@@ -1,11 +1,11 @@
 {
   "operationId": "Configurations_Analyze",
-  "title": "Analyze NGINX Configuration",
+  "title": "Analyze Nginx Configuration",
   "parameters": {
     "api-version": "2025-03-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "default",
     "body": {
       "config": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json
index df6ecf411dfd..9f92e17ce854 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "resource": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
@@ -94,7 +94,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json
index 4a2e9060c2cf..c3820d7fc430 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json
index 50c3068a85dd..3e0c1fa66312 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
@@ -33,7 +33,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json
index 5c1522153856..f0ab66374762 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -34,7 +34,7 @@
               },
               "rootFile": "ruslikdmiioyrmxkcdn"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
             "name": "cnhuyr",
             "type": "qmfrymjwsqqpzcj",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json
index 7c0c7b751a49..daca4618b03a 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "properties": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
index 2ca68c239215..41c5aeef9f86 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "resource": {
       "properties": {
         "nginxVersion": "yjvomuondmj",
@@ -202,7 +202,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
@@ -318,7 +318,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json
index 917acb9a5867..03321e90ab2a 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "202": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json
index c35bc55185be..41d11b4c1b78 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -108,7 +108,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
index 8b12f67eb20a..667838d908dd 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
@@ -109,7 +109,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
index a14c8ac2e996..ca762f3165ca 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
@@ -108,7 +108,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
index b4d206ea661a..d1b079161023 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json
index 833e05870b69..2d848c1e98fb 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "properties": {
       "identity": {
         "type": "None",
@@ -201,7 +201,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
index 1739b45fbbb7..3334b88d29ea 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "wafPolicyName": "myPolicy",
     "resource": {
       "properties": {
@@ -42,7 +42,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
@@ -75,7 +75,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json
index 28deff9d38a1..80c2208e3c57 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json
index ac3ec4889ae3..557eaa2b4ab5 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
@@ -26,7 +26,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json
index 8663bb519e3c..8359aba782b7 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -26,7 +26,7 @@
                 "time": "2025-07-08T10:11:08.856Z"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
             "name": "edgmihyonhwbgtk",
             "type": "omdgdqbbpucftlfmxm",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/main.tsp b/specification/nginx/Nginx.Management/main.tsp
index 96a4613b866f..d8ffa86ab7f4 100644
--- a/specification/nginx/Nginx.Management/main.tsp
+++ b/specification/nginx/Nginx.Management/main.tsp
@@ -16,7 +16,7 @@ using Azure.ResourceManager;
 @armProviderNamespace
 @service(#{ title: "Microsoft.Nginx.NginxPlus management service" })
 @versioned(Versions)
-namespace NGINX.NGINXPLUS;
+namespace Nginx.NginxPlus;
 
 /** The available API versions. */
 enum Versions {
diff --git a/specification/nginx/Nginx.Management/tspconfig.yaml b/specification/nginx/Nginx.Management/tspconfig.yaml
index 4cd08c8b3695..9beafa67440a 100644
--- a/specification/nginx/Nginx.Management/tspconfig.yaml
+++ b/specification/nginx/Nginx.Management/tspconfig.yaml
@@ -12,21 +12,21 @@ options:
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
   "@azure-tools/typespec-csharp":
     flavor: azure
-    package-dir: "Azure.ResourceManager.Nginx.NginxPlus"
+    package-dir: "Azure.ResourceManager.Nginx"
     clear-output-folder: true
     model-namespace: false
     namespace: "{package-dir}"
   "@azure-tools/typespec-python":
     flavor: azure
-    package-dir: "azure-mgmt-nginxplus"
-    namespace: "azure.mgmt.nginxplus"
+    package-dir: "azure-mgmt-nginx"
+    namespace: "azure.mgmt.nginx"
     generate-test: true
     generate-sample: true
   "@azure-tools/typespec-java":
     flavor: azure
     package-dir: "azure-resourcemanager-nginx"
     namespace: "com.azure.resourcemanager.nginx"
-    service-name: "Nginx"
+    service-name: "nginx"
   "@azure-tools/typespec-ts":
     experimental-extensible-enums: true
     package-dir: "arm-nginx"
diff --git a/specification/nginx/cspell.yaml b/specification/nginx/cspell.yaml
index 8a26202a1fb2..5ed272d3a948 100644
--- a/specification/nginx/cspell.yaml
+++ b/specification/nginx/cspell.yaml
@@ -10,7 +10,7 @@ words:
   - armnginx
   - nginxplus
 overrides:
-  - filename: '**/specification/nginx/resource-manager/NGINX.NGINXPLUS/**/*.json'
+  - filename: '**/specification/nginx/resource-manager/Nginx.NginxPlus/**/*.json'
     words:
       - autoscaled
       - autoupgrade
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
index 974ca75ee3f4..f572b52fc811 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Delete.json
similarity index 72%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Delete.json
index f27355b06fed..af4ada014138 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Delete.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Delete.json
@@ -8,7 +8,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Get.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Get.json
index e1ae4472f15d..2bbb35bd8448 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_List.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_List.json
index 03192135c284..b914c6eae36b 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
index 4f68c26d5e11..83f4b4e015ab 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Delete.json
similarity index 72%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Delete.json
index 6d3d9bc9df55..7ab2b36b87e2 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Delete.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Delete.json
@@ -8,7 +8,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Create.json
index 7dc786163e5c..f582dab3e7d6 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Delete.json
similarity index 69%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Delete.json
index 00decef8d7b7..e71705e1faf8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Delete.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Delete.json
@@ -7,7 +7,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Update.json
index aba3965cb814..fd73c08fe6a7 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
index 8ca9bff0afc7..4c8be2f51897 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
@@ -52,9 +52,6 @@
             "description": "The name of certificate",
             "required": true,
             "type": "string"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -106,9 +103,6 @@
             "required": true,
             "type": "string"
           },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          },
           {
             "in": "body",
             "name": "body",
@@ -173,9 +167,6 @@
             "description": "The name of certificate",
             "required": true,
             "type": "string"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -325,9 +316,6 @@
             "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -379,9 +367,6 @@
             "required": true,
             "type": "string"
           },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          },
           {
             "in": "body",
             "name": "body",
@@ -446,9 +431,6 @@
             "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -495,9 +477,6 @@
           },
           {
             "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -542,9 +521,6 @@
           {
             "$ref": "#/parameters/DeploymentNameParameter"
           },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          },
           {
             "in": "body",
             "name": "body",
@@ -605,9 +581,6 @@
           {
             "$ref": "#/parameters/DeploymentNameParameter"
           },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          },
           {
             "in": "body",
             "name": "body",
@@ -661,9 +634,6 @@
           },
           {
             "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -704,9 +674,6 @@
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -749,9 +716,6 @@
           },
           {
             "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -832,7 +796,6 @@
         "NotSpecified"
       ],
       "type": "string",
-      "readOnly": true,
       "x-ms-enum": {
         "modelAsString": true,
         "name": "ProvisioningState"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json
new file mode 100644
index 000000000000..20c6b276df1c
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -0,0 +1,44 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "certificateName": "default",
+    "requestBody": {
+      "properties": {
+        "keyVirtualPath": "/src/cert/somekey.key",
+        "certificateVirtualPath": "/src/cert/somePath.cert",
+        "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "name": "default",
+        "type": "nginx.nginxplus/nginxdeployments/certificates",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "keyVirtualPath": "/src/cert/somekey.key",
+          "certificateVirtualPath": "/src/cert/somePath.cert",
+          "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "name": "default",
+        "type": "nginx.nginxplus/nginxdeployments/certificates",
+        "properties": {
+          "provisioningState": "Accepted",
+          "keyVirtualPath": "/src/cert/somekey.key",
+          "certificateVirtualPath": "/src/cert/somePath.cert",
+          "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json
new file mode 100644
index 000000000000..be3649a10022
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "certificateName": "default"
+  },
+  "responses": {
+    "200": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
+    "204": {}
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json
new file mode 100644
index 000000000000..f8dc9b30d47f
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json
@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "certificateName": "default"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "name": "default",
+        "type": "nginx.nginxplus/nginxdeployments/certificates",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "keyVirtualPath": "/src/cert/somekey.key",
+          "certificateVirtualPath": "/src/cert/somePath.cert",
+          "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json
new file mode 100644
index 000000000000..f4cca33e8f12
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json
@@ -0,0 +1,38 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "name": "cert1",
+            "type": "nginx.nginxplus/nginxdeployments/certificates",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "keyVirtualPath": "/src/cert/somekey.key",
+              "certificateVirtualPath": "/src/cert/somePath.cert",
+              "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
+            }
+          },
+          {
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "name": "cert2",
+            "type": "nginx.nginxplus/nginxdeployments/certificates",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "keyVirtualPath": "/src/cert/somekey2.key",
+              "certificateVirtualPath": "/src/cert/somePath2.cert",
+              "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID2"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json
new file mode 100644
index 000000000000..794eed9505e6
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json
@@ -0,0 +1,65 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "configurationName": "default",
+    "requestBody": {
+      "properties": {
+        "files": [
+          {
+            "content": "ABCDEF==",
+            "virtualPath": "/etc/nginx/nginx.conf"
+          }
+        ],
+        "package": {
+          "data": null
+        },
+        "rootFile": "/etc/nginx/nginx.conf"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
+        "name": "default",
+        "type": "nginx.nginxplus/nginxDeployments/configurations",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "files": [
+            {
+              "content": "ABCDEF==",
+              "virtualPath": "/etc/nginx/nginx.conf"
+            }
+          ],
+          "package": {
+            "data": null
+          },
+          "rootFile": "/etc/nginx/nginx.conf"
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
+        "name": "default",
+        "type": "nginx.nginxplus/nginxDeployments/configurations",
+        "properties": {
+          "provisioningState": "Accepted",
+          "files": [
+            {
+              "content": "ABCDEF==",
+              "virtualPath": "/etc/nginx/nginx.conf"
+            }
+          ],
+          "package": {
+            "data": null
+          },
+          "rootFile": "/etc/nginx/nginx.conf"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json
new file mode 100644
index 000000000000..650cdd8b4852
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json
@@ -0,0 +1,18 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "configurationName": "default"
+  },
+  "responses": {
+    "200": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
+    "204": {}
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json
new file mode 100644
index 000000000000..f905ee1b25c2
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json
@@ -0,0 +1,31 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "configurationName": "default"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
+        "name": "default",
+        "type": "nginx.nginxplus/nginxDeployments/configurations",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "files": [
+            {
+              "content": "ABCDEF==",
+              "virtualPath": "/etc/nginx/nginx.conf"
+            }
+          ],
+          "package": {
+            "data": null
+          },
+          "rootFile": "/etc/nginx/nginx.conf"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json
new file mode 100644
index 000000000000..04012da5de9f
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json
@@ -0,0 +1,34 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
+            "name": "default",
+            "type": "nginx.nginxplus/nginxDeployments/configurations",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "files": [
+                {
+                  "content": "ABCDEF==",
+                  "virtualPath": "/etc/nginx/nginx.conf"
+                }
+              ],
+              "package": {
+                "data": null
+              },
+              "rootFile": "/etc/nginx/nginx.conf"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json
new file mode 100644
index 000000000000..21c4d3f5f62f
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json
@@ -0,0 +1,111 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "requestBody": {
+      "name": "myDeployment",
+      "tags": {
+        "Environment": "Dev"
+      },
+      "properties": {
+        "managedResourceGroup": "myManagedResourceGroup",
+        "networkProfile": {
+          "frontEndIPConfiguration": {
+            "publicIPAddresses": [
+              {
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+              }
+            ],
+            "privateIPAddresses": [
+              {
+                "privateIPAddress": "1.1.1.1",
+                "privateIPAllocationMethod": "Static",
+                "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+              }
+            ]
+          },
+          "networkInterfaceConfiguration": {
+            "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+          }
+        }
+      },
+      "location": "West US"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "name": "myDeployment",
+        "type": "nginx.nginxplus/deployments",
+        "location": "westus",
+        "tags": {
+          "Environment": "Dev"
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "nginxVersion": "nginx-1.19.6",
+          "managedResourceGroup": "myManagedResourceGroup",
+          "ipAddress": "1.1.1.1",
+          "networkProfile": {
+            "frontEndIPConfiguration": {
+              "publicIPAddresses": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                }
+              ],
+              "privateIPAddresses": [
+                {
+                  "privateIPAddress": "1.1.1.1",
+                  "privateIPAllocationMethod": "Static",
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              ]
+            },
+            "networkInterfaceConfiguration": {
+              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+            }
+          }
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "name": "myDeployment",
+        "type": "nginx.nginxplus/deployments",
+        "location": "westus",
+        "tags": {
+          "Environment": "Dev"
+        },
+        "properties": {
+          "provisioningState": "Accepted",
+          "nginxVersion": "nginx-1.19.6",
+          "managedResourceGroup": "myManagedResourceGroup",
+          "ipAddress": "1.1.1.1",
+          "networkProfile": {
+            "frontEndIPConfiguration": {
+              "publicIPAddresses": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                }
+              ],
+              "privateIPAddresses": [
+                {
+                  "privateIPAddress": "1.1.1.1",
+                  "privateIPAllocationMethod": "Static",
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              ]
+            },
+            "networkInterfaceConfiguration": {
+              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json
new file mode 100644
index 000000000000..badae143ef95
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment"
+  },
+  "responses": {
+    "200": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
+    "204": {}
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json
new file mode 100644
index 000000000000..402e8d585ea9
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json
@@ -0,0 +1,42 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "name": "myDeployment",
+        "type": "nginx.nginxplus/deployments",
+        "location": "westus",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "nginxVersion": "nginx-1.19.6",
+          "managedResourceGroup": "myManagedResourceGroup",
+          "networkProfile": {
+            "frontEndIPConfiguration": {
+              "publicIPAddresses": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                }
+              ],
+              "privateIPAddresses": [
+                {
+                  "privateIPAddress": "1.1.1.1",
+                  "privateIPAllocationMethod": "Static",
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              ]
+            },
+            "networkInterfaceConfiguration": {
+              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json
new file mode 100644
index 000000000000..682d69a6a53e
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json
@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+            "name": "myDeployment",
+            "type": "nginx.nginxplus/deployments",
+            "location": "westus",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "nginxVersion": "nginx-1.19.6",
+              "managedResourceGroup": "myManagedResourceGroup",
+              "ipAddress": "1.1.1.1",
+              "networkProfile": {
+                "frontEndIPConfiguration": {
+                  "publicIPAddresses": [
+                    {
+                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                    }
+                  ],
+                  "privateIPAddresses": [
+                    {
+                      "privateIPAddress": "1.1.1.1",
+                      "privateIPAllocationMethod": "Static",
+                      "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                    }
+                  ]
+                },
+                "networkInterfaceConfiguration": {
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json
new file mode 100644
index 000000000000..d1732bb650e0
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json
@@ -0,0 +1,46 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+            "name": "myDeployment",
+            "type": "nginx.nginxplus/deployments",
+            "location": "westus",
+            "properties": {
+              "provisioningState": "Succeeded",
+              "nginxVersion": "nginx-1.19.6",
+              "managedResourceGroup": "myManagedResourceGroup",
+              "ipAddress": "1.1.1.1",
+              "networkProfile": {
+                "frontEndIPConfiguration": {
+                  "publicIPAddresses": [
+                    {
+                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                    }
+                  ],
+                  "privateIPAddresses": [
+                    {
+                      "privateIPAddress": "1.1.1.1",
+                      "privateIPAllocationMethod": "Static",
+                      "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                    }
+                  ]
+                },
+                "networkInterfaceConfiguration": {
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json
new file mode 100644
index 000000000000..1503d3928f9b
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json
@@ -0,0 +1,86 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview",
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "myResourceGroup",
+    "deploymentName": "myDeployment",
+    "requestBody": {
+      "tags": {
+        "Environment": "Dev"
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "name": "myDeployment",
+        "type": "nginx.nginxplus/deployments",
+        "location": "westus",
+        "tags": {
+          "Environment": "Dev"
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "nginxVersion": "nginx-1.19.6",
+          "managedResourceGroup": "myManagedResourceGroup",
+          "ipAddress": "1.1.1.1",
+          "networkProfile": {
+            "frontEndIPConfiguration": {
+              "publicIPAddresses": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                }
+              ],
+              "privateIPAddresses": [
+                {
+                  "privateIPAddress": "1.1.1.1",
+                  "privateIPAllocationMethod": "Static",
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              ]
+            },
+            "networkInterfaceConfiguration": {
+              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+            }
+          }
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "name": "myDeployment",
+        "type": "nginx.nginxplus/deployments",
+        "location": "westus",
+        "tags": {
+          "Environment": "Dev"
+        },
+        "properties": {
+          "provisioningState": "Accepted",
+          "nginxVersion": "nginx-1.19.6",
+          "managedResourceGroup": "myManagedResourceGroup",
+          "networkProfile": {
+            "frontEndIPConfiguration": {
+              "publicIPAddresses": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
+                }
+              ],
+              "privateIPAddresses": [
+                {
+                  "privateIPAddress": "1.1.1.1",
+                  "privateIPAllocationMethod": "Static",
+                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+                }
+              ]
+            },
+            "networkInterfaceConfiguration": {
+              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json
new file mode 100644
index 000000000000..075a15e3b4f8
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json
@@ -0,0 +1,23 @@
+{
+  "parameters": {
+    "api-version": "2022-11-01-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "Nginx.NginxPlus/nginxDeployments/write",
+            "display": {
+              "provider": "Nginx.NginxPlus",
+              "resource": "deployments",
+              "operation": "write",
+              "description": "Write deployments resource"
+            }
+          }
+        ],
+        "nextLink": null
+      }
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
index 6f165da0f93c..73d7b997d7af 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "Nginx.NginxPlus",
-    "version": "2022-08-01"
+    "version": "2022-11-01-preview"
   },
   "host": "management.azure.com",
   "schemes": [
@@ -783,7 +783,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all operations provided by Nginx.NginxPlus for the 2022-08-01 api version.",
+        "summary": "List all operations provided by Nginx.NginxPlus for the 2022-11-01-preview api version.",
         "operationId": "Operations_List",
         "produces": [
           "application/json"
@@ -919,6 +919,13 @@
       "properties": {
         "data": {
           "type": "string"
+        },
+        "protectedFiles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "x-ms-identifiers": []
         }
       }
     },
@@ -1180,6 +1187,15 @@
         }
       }
     },
+    "NginxDeploymentScalingProperties": {
+      "type": "object",
+      "properties": {
+        "capacity": {
+          "format": "int32",
+          "type": "integer"
+        }
+      }
+    },
     "NginxDeploymentProperties": {
       "type": "object",
       "properties": {
@@ -1207,6 +1223,9 @@
         },
         "logging": {
           "$ref": "#/definitions/NginxLogging"
+        },
+        "scalingProperties": {
+          "$ref": "#/definitions/NginxDeploymentScalingProperties"
         }
       }
     },
@@ -1258,6 +1277,9 @@
         },
         "logging": {
           "$ref": "#/definitions/NginxLogging"
+        },
+        "scalingProperties": {
+          "$ref": "#/definitions/NginxDeploymentScalingProperties"
         }
       }
     },
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
index 64693ad00683..25bce17a8c39 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Get.json
index 6ebe1539d108..b8010f8c5413 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_List.json
index eca299266d2f..34f3c21a96e7 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Analysis.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Analysis.json
index d8b9483672dc..befd3c060024 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Analysis.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "config": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
index d1d7042bd13d..118df7da178f 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Create.json
index 68fee15a35fc..7704d04960f8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Update.json
index dcf8064cfa6e..a8ad2850c896 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
similarity index 96%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
index 83144ab1e38f..ca5c02d7c35b 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given NGINX deployment",
+        "summary": "Get a certificate of given Nginx deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the NGINX certificates for given NGINX deployment",
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the NGINX deployment",
+        "summary": "Deletes a certificate from the Nginx deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given NGINX deployment",
+        "summary": "List all certificates of given Nginx deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the NGINX configuration of given NGINX deployment.",
+        "summary": "List the Nginx configuration of given Nginx deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the NGINX configuration of given NGINX deployment",
+        "summary": "Get the Nginx configuration of given Nginx deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the NGINX configuration for given NGINX deployment",
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The NGINX configuration",
+            "description": "The Nginx configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
+        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -502,7 +502,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -513,7 +513,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The NGINX configuration to analyze",
+            "description": "The Nginx configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -545,7 +545,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the NGINX deployment",
+        "summary": "Get the Nginx deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -591,7 +591,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the NGINX deployment",
+        "summary": "Create or update the Nginx deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -654,7 +654,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the NGINX deployment",
+        "summary": "Update the Nginx deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -714,7 +714,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the NGINX deployment resource",
+        "summary": "Delete the Nginx deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -763,7 +763,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the NGINX deployments resources",
+        "summary": "List the Nginx deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -805,7 +805,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all NGINX deployments under the specified resource group.",
+        "summary": "List all Nginx deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1542,14 +1542,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an NGINX configuration.",
+      "description": "The request body for creating an analysis for an Nginx configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
+              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1601,7 +1601,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an NGINX configuration.",
+      "description": "An error object found during the analysis of an Nginx configuration.",
       "required": [
         "directive",
         "description",
@@ -1647,7 +1647,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted NGINX deployment",
+      "description": "The name of targeted Nginx deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
index a1aa34891dd9..8bb2ef8a80c8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Get.json
index 89f318ad0813..8827e57d7a29 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_List.json
index 325c6357096d..999d7fdf5d84 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Analysis.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Analysis.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Create.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Create.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Update.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Update.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
index a8783433f020..db8f97780a03 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given NGINX deployment",
+        "summary": "Get a certificate of given Nginx deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the NGINX certificates for given NGINX deployment",
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the NGINX deployment",
+        "summary": "Deletes a certificate from the Nginx deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given NGINX deployment",
+        "summary": "List all certificates of given Nginx deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the NGINX configuration of given NGINX deployment.",
+        "summary": "List the Nginx configuration of given Nginx deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the NGINX configuration of given NGINX deployment",
+        "summary": "Get the Nginx configuration of given Nginx deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the NGINX configuration for given NGINX deployment",
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The NGINX configuration",
+            "description": "The Nginx configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
+        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -502,7 +502,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -513,7 +513,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The NGINX configuration to analyze",
+            "description": "The Nginx configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -545,7 +545,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the NGINX deployment",
+        "summary": "Get the Nginx deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -591,7 +591,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the NGINX deployment",
+        "summary": "Create or update the Nginx deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -654,7 +654,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the NGINX deployment",
+        "summary": "Update the Nginx deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -714,7 +714,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the NGINX deployment resource",
+        "summary": "Delete the Nginx deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -763,7 +763,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the NGINX deployments resources",
+        "summary": "List the Nginx deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -805,7 +805,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all NGINX deployments under the specified resource group.",
+        "summary": "List all Nginx deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1385,7 +1385,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Settings for NGINX App Protect (NAP)",
+          "description": "Settings for Nginx App Protect (NAP)",
           "required": [
             "webApplicationFirewallSettings"
           ],
@@ -1461,7 +1461,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Update settings for NGINX App Protect (NAP)",
+          "description": "Update settings for Nginx App Protect (NAP)",
           "properties": {
             "webApplicationFirewallSettings": {
               "$ref": "#/definitions/WebApplicationFirewallSettings"
@@ -1567,14 +1567,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an NGINX configuration.",
+      "description": "The request body for creating an analysis for an Nginx configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
+              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1626,7 +1626,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an NGINX configuration.",
+      "description": "An error object found during the analysis of an Nginx configuration.",
       "required": [
         "directive",
         "description",
@@ -1669,7 +1669,7 @@
     },
     "WebApplicationFirewallSettings": {
       "type": "object",
-      "description": "Settings for the NGINX App Protect Web Application Firewall (WAF)",
+      "description": "Settings for the Nginx App Protect Web Application Firewall (WAF)",
       "properties": {
         "activationState": {
           "type": "string",
@@ -1680,40 +1680,40 @@
           "description": "The activation state of the WAF. Use 'Enabled' to enable the WAF and 'Disabled' to disable it.",
           "x-ms-enum": {
             "modelAsString": true,
-            "name": "activationState"
+            "name": "WebApplicationFirewallSettings"
           }
         }
       }
     },
     "WebApplicationFirewallStatus": {
       "type": "object",
-      "description": "The status of the NGINX App Protect Web Application Firewall",
+      "description": "The status of the Nginx App Protect Web Application Firewall",
       "properties": {
         "attackSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing attack signatures for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing attack signatures for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "botSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing bot signatures for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing bot signatures for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "threatCampaignsPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing threat campaigns for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing threat campaigns for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "componentVersions": {
           "$ref": "#/definitions/WebApplicationFirewallComponentVersions",
           "readOnly": true,
-          "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components."
+          "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components."
         }
       }
     },
     "WebApplicationFirewallPackage": {
       "type": "object",
-      "description": "NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
+      "description": "Nginx App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
       "required": [
         "version",
         "revisionDatetime"
@@ -1722,7 +1722,7 @@
         "version": {
           "type": "string",
           "example": "2.02",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) package."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) package."
         },
         "revisionDatetime": {
           "type": "string",
@@ -1739,17 +1739,17 @@
         "wafEngineVersion",
         "wafNginxVersion"
       ],
-      "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components.",
+      "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components.",
       "properties": {
         "wafEngineVersion": {
           "type": "string",
           "example": "10.624.0",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) engine."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) engine."
         },
         "wafNginxVersion": {
           "type": "string",
           "example": "4.815.0",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) module for NGINX."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) module for Nginx."
         }
       }
     }
@@ -1758,7 +1758,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted NGINX deployment",
+      "description": "The name of targeted Nginx deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
similarity index 89%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
index 027fa42c5c66..586ca0f6b5b8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
@@ -15,7 +15,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
@@ -26,7 +26,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
index 48b3034d58bf..1ebd9c7f010e 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Get.json
index 314ad0ea58da..de7a0b7369e4 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_List.json
index 7c778eff2ccb..6910002817d7 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Analysis.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Analysis.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Create.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Create.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Update.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Update.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
similarity index 96%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
index e40b156b3a93..ba2307d2d9a6 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
@@ -236,7 +236,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given NGINX deployment",
+        "summary": "Get a certificate of given Nginx deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -286,7 +286,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the NGINX certificates for given NGINX deployment",
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -357,7 +357,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the NGINX deployment",
+        "summary": "Deletes a certificate from the Nginx deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -413,7 +413,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given NGINX deployment",
+        "summary": "List all certificates of given Nginx deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -461,7 +461,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the NGINX configuration of given NGINX deployment.",
+        "summary": "List the Nginx configuration of given Nginx deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -509,7 +509,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the NGINX configuration of given NGINX deployment",
+        "summary": "Get the Nginx configuration of given Nginx deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -527,7 +527,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -559,7 +559,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the NGINX configuration for given NGINX deployment",
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -580,7 +580,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -590,7 +590,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The NGINX configuration",
+            "description": "The Nginx configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfigurationRequest"
             }
@@ -630,7 +630,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -648,7 +648,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -686,7 +686,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
+        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -707,7 +707,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -718,7 +718,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The NGINX configuration to analyze",
+            "description": "The Nginx configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -750,7 +750,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the NGINX deployment",
+        "summary": "Get the Nginx deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -796,7 +796,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the NGINX deployment",
+        "summary": "Create or update the Nginx deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -859,7 +859,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the NGINX deployment",
+        "summary": "Update the Nginx deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -919,7 +919,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the NGINX deployment resource",
+        "summary": "Delete the Nginx deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -968,7 +968,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the NGINX deployments resources",
+        "summary": "List the Nginx deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -1010,7 +1010,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all NGINX deployments under the specified resource group.",
+        "summary": "List all Nginx deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1663,7 +1663,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Settings for NGINX App Protect (NAP)",
+          "description": "Settings for Nginx App Protect (NAP)",
           "required": [
             "webApplicationFirewallSettings"
           ],
@@ -1679,7 +1679,7 @@
         },
         "dataplaneApiEndpoint": {
           "type": "string",
-          "description": "Dataplane API endpoint for the caller to update the NGINX state of the deployment.",
+          "description": "Dataplane API endpoint for the caller to update the Nginx state of the deployment.",
           "readOnly": true
         }
       }
@@ -1744,7 +1744,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Update settings for NGINX App Protect (NAP)",
+          "description": "Update settings for Nginx App Protect (NAP)",
           "properties": {
             "webApplicationFirewallSettings": {
               "$ref": "#/definitions/WebApplicationFirewallSettings"
@@ -1937,14 +1937,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an NGINX configuration.",
+      "description": "The request body for creating an analysis for an Nginx configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
+              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1996,7 +1996,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an NGINX configuration.",
+      "description": "An error object found during the analysis of an Nginx configuration.",
       "required": [
         "directive",
         "description",
@@ -2039,7 +2039,7 @@
     },
     "WebApplicationFirewallSettings": {
       "type": "object",
-      "description": "Settings for the NGINX App Protect Web Application Firewall (WAF)",
+      "description": "Settings for the Nginx App Protect Web Application Firewall (WAF)",
       "properties": {
         "activationState": {
           "type": "string",
@@ -2050,40 +2050,40 @@
           "description": "The activation state of the WAF. Use 'Enabled' to enable the WAF and 'Disabled' to disable it.",
           "x-ms-enum": {
             "modelAsString": true,
-            "name": "activationState"
+            "name": "WebApplicationFirewallSettings"
           }
         }
       }
     },
     "WebApplicationFirewallStatus": {
       "type": "object",
-      "description": "The status of the NGINX App Protect Web Application Firewall",
+      "description": "The status of the Nginx App Protect Web Application Firewall",
       "properties": {
         "attackSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing attack signatures for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing attack signatures for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "botSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing bot signatures for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing bot signatures for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "threatCampaignsPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing threat campaigns for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing threat campaigns for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "componentVersions": {
           "$ref": "#/definitions/WebApplicationFirewallComponentVersions",
           "readOnly": true,
-          "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components."
+          "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components."
         }
       }
     },
     "WebApplicationFirewallPackage": {
       "type": "object",
-      "description": "NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
+      "description": "Nginx App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
       "required": [
         "version",
         "revisionDatetime"
@@ -2092,7 +2092,7 @@
         "version": {
           "type": "string",
           "example": "2.02",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) package."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) package."
         },
         "revisionDatetime": {
           "type": "string",
@@ -2109,17 +2109,17 @@
         "wafEngineVersion",
         "wafNginxVersion"
       ],
-      "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components.",
+      "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components.",
       "properties": {
         "wafEngineVersion": {
           "type": "string",
           "example": "10.624.0",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) engine."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) engine."
         },
         "wafNginxVersion": {
           "type": "string",
           "example": "4.815.0",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) module for NGINX."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) module for Nginx."
         }
       }
     }
@@ -2128,7 +2128,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted NGINX deployment",
+      "description": "The name of targeted Nginx deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
similarity index 89%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
index 6a8f688cad1e..1a7668d68651 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
@@ -15,7 +15,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
@@ -26,7 +26,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
index cec2f11b7e2c..68d84b7fab12 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Get.json
index 46776cd1c221..95dad8d130d2 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_List.json
index f9b5e0d7033d..141c44958f05 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Analysis.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Analysis.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Create.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Create.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Update.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Update.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
index 88a980dda56b..f3b774b96d7d 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
@@ -236,7 +236,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given NGINX deployment",
+        "summary": "Get a certificate of given Nginx deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -286,7 +286,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the NGINX certificates for given NGINX deployment",
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -357,7 +357,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the NGINX deployment",
+        "summary": "Deletes a certificate from the Nginx deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -413,7 +413,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given NGINX deployment",
+        "summary": "List all certificates of given Nginx deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -461,7 +461,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the NGINX configuration of given NGINX deployment.",
+        "summary": "List the Nginx configuration of given Nginx deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -509,7 +509,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the NGINX configuration of given NGINX deployment",
+        "summary": "Get the Nginx configuration of given Nginx deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -527,7 +527,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -559,7 +559,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the NGINX configuration for given NGINX deployment",
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -580,7 +580,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -590,7 +590,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The NGINX configuration",
+            "description": "The Nginx configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfigurationRequest"
             }
@@ -630,7 +630,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -648,7 +648,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -686,7 +686,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
+        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -707,7 +707,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -718,7 +718,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The NGINX configuration to analyze",
+            "description": "The Nginx configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -750,7 +750,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the NGINX deployment",
+        "summary": "Get the Nginx deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -796,7 +796,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the NGINX deployment",
+        "summary": "Create or update the Nginx deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -859,7 +859,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the NGINX deployment",
+        "summary": "Update the Nginx deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -922,7 +922,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the NGINX deployment resource",
+        "summary": "Delete the Nginx deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -971,7 +971,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the NGINX deployments resources",
+        "summary": "List the Nginx deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -1013,7 +1013,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all NGINX deployments under the specified resource group.",
+        "summary": "List all Nginx deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1666,7 +1666,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Settings for NGINX App Protect (NAP)",
+          "description": "Settings for Nginx App Protect (NAP)",
           "required": [
             "webApplicationFirewallSettings"
           ],
@@ -1682,7 +1682,7 @@
         },
         "dataplaneApiEndpoint": {
           "type": "string",
-          "description": "Dataplane API endpoint for the caller to update the NGINX state of the deployment.",
+          "description": "Dataplane API endpoint for the caller to update the Nginx state of the deployment.",
           "readOnly": true
         }
       }
@@ -1750,7 +1750,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Update settings for NGINX App Protect (NAP)",
+          "description": "Update settings for Nginx App Protect (NAP)",
           "properties": {
             "webApplicationFirewallSettings": {
               "$ref": "#/definitions/WebApplicationFirewallSettings"
@@ -1943,14 +1943,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an NGINX configuration.",
+      "description": "The request body for creating an analysis for an Nginx configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
+              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -2008,7 +2008,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an NGINX configuration.",
+      "description": "An error object found during the analysis of an Nginx configuration.",
       "required": [
         "directive",
         "description",
@@ -2051,7 +2051,7 @@
     },
     "DiagnosticItem": {
       "type": "object",
-      "description": "A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.",
+      "description": "A diagnostic is a message associated with an Nginx config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category",
       "required": [
         "directive",
         "description",
@@ -2064,7 +2064,7 @@
       "properties": {
         "id": {
           "type": "string",
-          "description": "Unique identifier for the diagnostic."
+          "description": "Unique identifier for the diagnostic"
         },
         "directive": {
           "type": "string",
@@ -2072,11 +2072,11 @@
         },
         "description": {
           "type": "string",
-          "example": "Some directives cannot be overridden by the user provided configuration."
+          "example": "Some directives cannot be overridden by the user provided configuration"
         },
         "file": {
           "type": "string",
-          "description": "The filepath of the most relevant config file.",
+          "description": "the filepath of the most relevant config file.",
           "example": "nginx.conf"
         },
         "line": {
@@ -2085,7 +2085,7 @@
         },
         "message": {
           "type": "string",
-          "example": "The value will be overridden with `4000`."
+          "example": "the value will be overridden with `4000`"
         },
         "rule": {
           "type": "string",
@@ -2113,7 +2113,7 @@
     },
     "WebApplicationFirewallSettings": {
       "type": "object",
-      "description": "Settings for the NGINX App Protect Web Application Firewall (WAF)",
+      "description": "Settings for the Nginx App Protect Web Application Firewall (WAF)",
       "properties": {
         "activationState": {
           "type": "string",
@@ -2131,33 +2131,33 @@
     },
     "WebApplicationFirewallStatus": {
       "type": "object",
-      "description": "The status of the NGINX App Protect Web Application Firewall",
+      "description": "The status of the Nginx App Protect Web Application Firewall",
       "properties": {
         "attackSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing attack signatures for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing attack signatures for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "botSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing bot signatures for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing bot signatures for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "threatCampaignsPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing threat campaigns for the NGINX App Protect Web Application Firewall (WAF)."
+          "description": "Package containing threat campaigns for the Nginx App Protect Web Application Firewall (WAF)."
         },
         "componentVersions": {
           "$ref": "#/definitions/WebApplicationFirewallComponentVersions",
           "readOnly": true,
-          "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components."
+          "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components."
         }
       }
     },
     "WebApplicationFirewallPackage": {
       "type": "object",
-      "description": "NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
+      "description": "Nginx App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
       "required": [
         "version",
         "revisionDatetime"
@@ -2166,7 +2166,7 @@
         "version": {
           "type": "string",
           "example": "2.02",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) package."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) package."
         },
         "revisionDatetime": {
           "type": "string",
@@ -2183,17 +2183,17 @@
         "wafEngineVersion",
         "wafNginxVersion"
       ],
-      "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components.",
+      "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components.",
       "properties": {
         "wafEngineVersion": {
           "type": "string",
           "example": "10.624.0",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) engine."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) engine."
         },
         "wafNginxVersion": {
           "type": "string",
           "example": "4.815.0",
-          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) module for NGINX."
+          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) module for Nginx."
         }
       }
     }
@@ -2202,7 +2202,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted NGINX deployment",
+      "description": "The name of targeted Nginx deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
index 757676f0aeb2..f2be78b61b3b 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "apiKeyName": "myApiKey",
     "resource": {
       "properties": {
@@ -21,7 +21,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
@@ -40,7 +40,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
index 5ac2423187d2..64a5ac53e7c5 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
similarity index 90%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
index 81448b2fcd57..9d653a0c46aa 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
@@ -15,7 +15,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
index 7b47487b1fba..f1c9809b6214 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -16,7 +16,7 @@
               "hint": "my secret API key hint",
               "endDateTime": "2025-05-28T20:01:03.647Z"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
             "name": "otvmugiwezqyit",
             "type": "ugslayxowhvlfgkfldbnbulh",
             "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
index 31df5ccfa883..7ec5029b64cb 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "resource": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
@@ -69,7 +69,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
index 040deb691f5c..3fef6b053060 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
index ecc3b3fa376f..a031ed171dc4 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
@@ -24,7 +24,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
index 423277a8086c..414257fe0c63 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -25,7 +25,7 @@
                 "message": "wqvmvmvchwavboxzhrhne"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/gr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/gr",
             "name": "gr",
             "type": "moqybsvacvokh",
             "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
index 0e4a7a4eee88..6ba94c2ff9a9 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "properties": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Analyze.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Analyze.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Analyze.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Analyze.json
index abdc08cb82a6..76c564d38506 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Analyze.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Analyze.json
@@ -1,11 +1,11 @@
 {
   "operationId": "Configurations_Analyze",
-  "title": "Analyze NGINX Configuration",
+  "title": "Analyze Nginx Configuration",
   "parameters": {
     "api-version": "2025-03-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "default",
     "body": {
       "config": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
index df6ecf411dfd..9f92e17ce854 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "resource": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
@@ -94,7 +94,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
index 4a2e9060c2cf..c3820d7fc430 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
index 50c3068a85dd..3e0c1fa66312 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
@@ -33,7 +33,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
index 5c1522153856..f0ab66374762 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -34,7 +34,7 @@
               },
               "rootFile": "ruslikdmiioyrmxkcdn"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
             "name": "cnhuyr",
             "type": "qmfrymjwsqqpzcj",
             "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
index 7c0c7b751a49..daca4618b03a 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "properties": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
index 2ca68c239215..41c5aeef9f86 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "resource": {
       "properties": {
         "nginxVersion": "yjvomuondmj",
@@ -202,7 +202,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
@@ -318,7 +318,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
index 917acb9a5867..03321e90ab2a 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "202": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
similarity index 97%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
index c35bc55185be..41d11b4c1b78 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -108,7 +108,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
index 8b12f67eb20a..667838d908dd 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
@@ -109,7 +109,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
index a14c8ac2e996..ca762f3165ca 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
@@ -108,7 +108,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
index b4d206ea661a..d1b079161023 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
index 833e05870b69..2d848c1e98fb 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "properties": {
       "identity": {
         "type": "None",
@@ -201,7 +201,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
index 1739b45fbbb7..3334b88d29ea 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "wafPolicyName": "myPolicy",
     "resource": {
       "properties": {
@@ -42,7 +42,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
@@ -75,7 +75,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
index 28deff9d38a1..80c2208e3c57 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
index ac3ec4889ae3..557eaa2b4ab5 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment",
+    "deploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
@@ -26,7 +26,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
index 8663bb519e3c..8359aba782b7 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "nginxDeploymentName": "myDeployment"
+    "deploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -26,7 +26,7 @@
                 "time": "2025-07-08T10:11:08.856Z"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
             "name": "edgmihyonhwbgtk",
             "type": "omdgdqbbpucftlfmxm",
             "systemData": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
similarity index 97%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
index ed1af07c7b03..c81c1381bcc6 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
@@ -59,7 +59,7 @@
     }
   ],
   "paths": {
-    "/providers/NGINX.NGINXPLUS/operations": {
+    "/providers/Nginx.NginxPlus/operations": {
       "get": {
         "operationId": "Operations_List",
         "tags": [
@@ -98,7 +98,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/providers/NGINX.NGINXPLUS/nginxDeployments": {
+    "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments": {
       "get": {
         "operationId": "NginxDeployments_ListBySubscription",
         "tags": [
@@ -137,7 +137,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments": {
       "get": {
         "operationId": "NginxDeployments_ListByResourceGroup",
         "tags": [
@@ -179,7 +179,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}": {
       "get": {
         "operationId": "NginxDeployments_Get",
         "tags": [
@@ -197,7 +197,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -242,7 +242,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -317,7 +317,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -371,7 +371,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -415,7 +415,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys": {
       "get": {
         "operationId": "ApiKeys_ListByDeployment",
         "tags": [
@@ -433,7 +433,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -465,7 +465,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys/{apiKeyName}": {
       "get": {
         "operationId": "ApiKeys_Get",
         "tags": [
@@ -483,7 +483,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -536,7 +536,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -611,7 +611,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -663,7 +663,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates": {
       "get": {
         "operationId": "Certificates_ListByDeployment",
         "tags": [
@@ -681,7 +681,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -713,7 +713,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates/{certificateName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}": {
       "get": {
         "operationId": "Certificates_Get",
         "tags": [
@@ -731,7 +731,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -784,7 +784,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -867,7 +867,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -929,7 +929,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -981,7 +981,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations": {
       "get": {
         "operationId": "Configurations_ListByDeployment",
         "tags": [
@@ -999,7 +999,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1031,7 +1031,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}": {
       "get": {
         "operationId": "Configurations_Get",
         "tags": [
@@ -1049,7 +1049,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1102,7 +1102,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1177,7 +1177,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1239,7 +1239,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1291,7 +1291,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}/analyze": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}/analyze": {
       "post": {
         "operationId": "Configurations_Analyze",
         "tags": [
@@ -1309,7 +1309,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1349,13 +1349,13 @@
           }
         },
         "x-ms-examples": {
-          "Analyze NGINX Configuration": {
+          "Analyze Nginx Configuration": {
             "$ref": "./examples/Configurations_Analyze.json"
           }
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/listDefaultWafPolicies": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/listDefaultWafPolicies": {
       "post": {
         "operationId": "NginxDeployments_ListDefaultWafPolicies",
         "tags": [
@@ -1373,7 +1373,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1402,7 +1402,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/wafPolicies": {
       "get": {
         "operationId": "WafPolicies_ListByDeployment",
         "tags": [
@@ -1420,7 +1420,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1452,7 +1452,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies/{wafPolicyName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/wafPolicies/{wafPolicyName}": {
       "get": {
         "operationId": "WafPolicies_Get",
         "tags": [
@@ -1470,7 +1470,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1523,7 +1523,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1606,7 +1606,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "nginxDeploymentName",
+            "name": "deploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1690,7 +1690,7 @@
       "properties": {
         "rootFile": {
           "type": "string",
-          "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
+          "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
         },
         "files": {
           "type": "array",
@@ -1716,7 +1716,7 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an NGINX configuration.",
+      "description": "The request body for creating an analysis for an Nginx configuration.",
       "properties": {
         "config": {
           "$ref": "#/definitions/AnalysisConfig",
@@ -1729,7 +1729,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an NGINX configuration.",
+      "description": "An error object found during the analysis of an Nginx configuration.",
       "properties": {
         "id": {
           "type": "string",
@@ -1874,8 +1874,7 @@
         }
       },
       "required": [
-        "secretText",
-        "endDateTime"
+        "secretText"
       ]
     },
     "ApiKeyResponseProperties": {
@@ -1892,8 +1891,7 @@
         }
       },
       "required": [
-        "hint",
-        "endDateTime"
+        "hint"
       ]
     },
     "AutoScaleSettings": {
@@ -2010,6 +2008,10 @@
         "properties": {
           "$ref": "#/definitions/NginxCertificateProperties",
           "description": "The resource-specific properties for this resource."
+        },
+        "location": {
+          "type": "string",
+          "description": "Gets or sets the location."
         }
       },
       "allOf": [
@@ -2043,6 +2045,10 @@
       "type": "object",
       "description": "The type used for update operations of the Certificate.",
       "properties": {
+        "location": {
+          "type": "string",
+          "description": "Gets or sets the location."
+        },
         "properties": {
           "$ref": "#/definitions/CertificateUpdateProperties",
           "description": "The resource-specific properties for this resource."
@@ -2063,7 +2069,6 @@
         },
         "keyVaultSecretId": {
           "type": "string",
-          "format": "uri",
           "description": "The Key Vault secret ID. Example: `https://myvault.vault.azure.net/secrets/mysecret/1234567890abcdef1234567890abcdef`."
         },
         "sha1Thumbprint": {
@@ -2212,7 +2217,7 @@
     },
     "DiagnosticItem": {
       "type": "object",
-      "description": "A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.",
+      "description": "A diagnostic is a message associated with an Nginx config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.",
       "properties": {
         "id": {
           "type": "string",
@@ -2421,7 +2426,6 @@
         },
         "keyVaultSecretId": {
           "type": "string",
-          "format": "uri",
           "description": "The Key Vault secret ID. Example: `https://myvault.vault.azure.net/secrets/mysecret/1234567890abcdef1234567890abcdef`."
         },
         "sha1Thumbprint": {
@@ -2602,14 +2606,14 @@
       "type": "object",
       "description": "Represents an Nginx deployment resource.",
       "properties": {
-        "properties": {
-          "$ref": "#/definitions/NginxDeploymentProperties",
-          "description": "The resource-specific properties for this resource."
-        },
         "identity": {
           "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
           "description": "The managed service identities assigned to this resource."
         },
+        "properties": {
+          "$ref": "#/definitions/NginxDeploymentProperties",
+          "description": "The resource-specific properties for this resource."
+        },
         "sku": {
           "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/Sku",
           "description": "The SKU (Stock Keeping Unit) assigned to this resource."
@@ -2801,7 +2805,6 @@
         "nginxVersion",
         "networkProfile",
         "ipAddress",
-        "enableDiagnosticsSupport",
         "logging",
         "scalingProperties",
         "autoUpgradeProfile",
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
index e1c7066b8bcd..378105c4fc8f 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Delete.json
similarity index 71%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Delete.json
index af9031d0419d..5add46b5a4db 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Delete.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Delete.json
@@ -8,7 +8,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Get.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Get.json
index 6ba9c1a58d28..48b1147f5dab 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_List.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_List.json
index 05efc6174b2f..3b33f41a2823 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
index ac0e2cec6572..07e100e1cc1b 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Delete.json
similarity index 71%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Delete.json
index b6152093de3b..bf1a0d68a71e 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Delete.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Delete.json
@@ -8,7 +8,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Create.json
index 92290b83747f..87adc0c64904 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Delete.json
similarity index 69%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Delete.json
index 78e6ffc0794f..411aeb846bec 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Delete.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Delete.json
@@ -7,7 +7,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://foo.com/operationstatus"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Update.json
index 065b791705a9..43aa12827cf8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json
new file mode 100644
index 000000000000..c37bde481e53
--- /dev/null
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json
@@ -0,0 +1,1333 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Nginx.NginxPlus",
+    "version": "2022-08-01"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}": {
+      "get": {
+        "tags": [
+          "NginxCertificate"
+        ],
+        "summary": "Get a certificate of given Nginx deployment",
+        "operationId": "Certificates_Get",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "path",
+            "name": "certificateName",
+            "description": "The name of certificate",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxCertificate"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Certificates_Get": {
+            "$ref": "./examples/Certificates_Get.json"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NginxCertificate"
+        ],
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "operationId": "Certificates_Create",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "path",
+            "name": "certificateName",
+            "description": "The name of certificate",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "body",
+            "description": "The certificate",
+            "schema": {
+              "$ref": "#/definitions/NginxCertificate"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxCertificate"
+            }
+          },
+          "201": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxCertificate"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
+        "x-ms-examples": {
+          "Certificates_CreateOrUpdate": {
+            "$ref": "./examples/Certificates_CreateOrUpdate.json"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "NginxCertificate"
+        ],
+        "summary": "Deletes a certificate from the nginx deployment",
+        "operationId": "Certificates_Delete",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "path",
+            "name": "certificateName",
+            "description": "The name of certificate",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "202": {
+            "description": "Success"
+          },
+          "204": {
+            "description": "Success"
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Certificates_Delete": {
+            "$ref": "./examples/Certificates_Delete.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates": {
+      "get": {
+        "tags": [
+          "NginxCertificate"
+        ],
+        "summary": "List all certificates of given Nginx deployment",
+        "operationId": "Certificates_List",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxCertificateListResponse"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Certificates_List": {
+            "$ref": "./examples/Certificates_List.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations": {
+      "get": {
+        "tags": [
+          "NginxConfiguration"
+        ],
+        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "operationId": "Configurations_List",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxConfigurationListResponse"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Configurations_List": {
+            "$ref": "./examples/Configurations_List.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}": {
+      "get": {
+        "tags": [
+          "NginxConfiguration"
+        ],
+        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "operationId": "Configurations_Get",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "path",
+            "name": "configurationName",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxConfiguration"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Configurations_Get": {
+            "$ref": "./examples/Configurations_Get.json"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NginxConfiguration"
+        ],
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "operationId": "Configurations_CreateOrUpdate",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "path",
+            "name": "configurationName",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "body",
+            "description": "The Nginx configuration",
+            "schema": {
+              "$ref": "#/definitions/NginxConfiguration"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxConfiguration"
+            }
+          },
+          "201": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxConfiguration"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
+        "x-ms-examples": {
+          "Configurations_CreateOrUpdate": {
+            "$ref": "./examples/Configurations_CreateOrUpdate.json"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "NginxConfiguration"
+        ],
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "operationId": "Configurations_Delete",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "path",
+            "name": "configurationName",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "202": {
+            "description": "Success"
+          },
+          "204": {
+            "description": "Success"
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Configurations_Delete": {
+            "$ref": "./examples/Configurations_Delete.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}": {
+      "get": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "Get the Nginx deployment",
+        "operationId": "Deployments_Get",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeployment"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Deployments_Get": {
+            "$ref": "./examples/Deployments_Get.json"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "Create or update the Nginx deployment",
+        "operationId": "Deployments_Create",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "body",
+            "name": "body",
+            "schema": {
+              "$ref": "#/definitions/NginxDeployment"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeployment"
+            }
+          },
+          "201": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeployment"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "azure-async-operation"
+        },
+        "x-ms-examples": {
+          "Deployments_Create": {
+            "$ref": "./examples/Deployments_Create.json"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "Update the Nginx deployment",
+        "operationId": "Deployments_Update",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "in": "body",
+            "name": "body",
+            "schema": {
+              "$ref": "#/definitions/NginxDeploymentUpdateParameters"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeployment"
+            }
+          },
+          "201": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeployment"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Deployments_Update": {
+            "$ref": "./examples/Deployments_Update.json"
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "Delete the Nginx deployment resource",
+        "operationId": "Deployments_Delete",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "#/parameters/DeploymentNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "202": {
+            "description": "Success"
+          },
+          "204": {
+            "description": "Success"
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Deployments_Delete": {
+            "$ref": "./examples/Deployments_Delete.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments": {
+      "get": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "List the Nginx deployments resources",
+        "operationId": "Deployments_List",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeploymentListResponse"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Deployments_List": {
+            "$ref": "./examples/Deployments_List.json"
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments": {
+      "get": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "List all Nginx deployments under the specified resource group.",
+        "operationId": "Deployments_ListByResourceGroup",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/NginxDeploymentListResponse"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Deployments_ListByResourceGroup": {
+            "$ref": "./examples/Deployments_ListByResourceGroup.json"
+          }
+        }
+      }
+    },
+    "/providers/Nginx.NginxPlus/operations": {
+      "get": {
+        "tags": [
+          "NginxDeployment"
+        ],
+        "summary": "List all operations provided by Nginx.NginxPlus for the 2022-08-01 api version.",
+        "operationId": "Operations_List",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/OperationListResult"
+            }
+          },
+          "default": {
+            "description": "Default error response.",
+            "schema": {
+              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-examples": {
+          "Operations_List": {
+            "$ref": "./examples/Operations_List.json"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ProvisioningState": {
+      "enum": [
+        "Accepted",
+        "Creating",
+        "Updating",
+        "Deleting",
+        "Succeeded",
+        "Failed",
+        "Canceled",
+        "Deleted",
+        "NotSpecified"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "ProvisioningState"
+      }
+    },
+    "NginxCertificateProperties": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "$ref": "#/definitions/ProvisioningState"
+        },
+        "keyVirtualPath": {
+          "type": "string"
+        },
+        "certificateVirtualPath": {
+          "type": "string"
+        },
+        "keyVaultSecretId": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxCertificate": {
+      "type": "object",
+      "x-ms-azure-resource": true,
+      "properties": {
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
+        "properties": {
+          "$ref": "#/definitions/NginxCertificateProperties"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "location": {
+          "type": "string"
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "readOnly": true
+        }
+      }
+    },
+    "NginxCertificateListResponse": {
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxCertificate"
+          }
+        },
+        "nextLink": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxConfigurationFile": {
+      "type": "object",
+      "properties": {
+        "content": {
+          "type": "string"
+        },
+        "virtualPath": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxConfigurationPackage": {
+      "type": "object",
+      "properties": {
+        "data": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxConfigurationProperties": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "$ref": "#/definitions/ProvisioningState"
+        },
+        "files": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxConfigurationFile"
+          },
+          "x-ms-identifiers": []
+        },
+        "protectedFiles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxConfigurationFile"
+          },
+          "x-ms-identifiers": []
+        },
+        "package": {
+          "$ref": "#/definitions/NginxConfigurationPackage"
+        },
+        "rootFile": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxConfiguration": {
+      "type": "object",
+      "x-ms-azure-resource": true,
+      "properties": {
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
+        "properties": {
+          "$ref": "#/definitions/NginxConfigurationProperties"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "location": {
+          "type": "string"
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "readOnly": true
+        }
+      }
+    },
+    "NginxConfigurationListResponse": {
+      "description": "Response of a list operation.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Results of a list operation.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxConfiguration"
+          }
+        },
+        "nextLink": {
+          "description": "Link to the next set of results, if any.",
+          "type": "string"
+        }
+      }
+    },
+    "ErrorResponseBody": {
+      "type": "object",
+      "properties": {
+        "code": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        },
+        "target": {
+          "type": "string"
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ErrorResponseBody"
+          },
+          "x-ms-identifiers": []
+        }
+      }
+    },
+    "ResourceProviderDefaultErrorResponse": {
+      "type": "object",
+      "properties": {
+        "error": {
+          "$ref": "#/definitions/ErrorResponseBody"
+        }
+      }
+    },
+    "IdentityType": {
+      "enum": [
+        "SystemAssigned",
+        "UserAssigned",
+        "SystemAssigned, UserAssigned",
+        "None"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "IdentityType"
+      }
+    },
+    "UserIdentityProperties": {
+      "type": "object",
+      "properties": {
+        "principalId": {
+          "type": "string",
+          "readOnly": true
+        },
+        "clientId": {
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "ResourceSku": {
+      "required": [
+        "name"
+      ],
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the SKU.",
+          "type": "string"
+        }
+      }
+    },
+    "IdentityProperties": {
+      "type": "object",
+      "properties": {
+        "principalId": {
+          "type": "string",
+          "readOnly": true
+        },
+        "tenantId": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "$ref": "#/definitions/IdentityType"
+        },
+        "userAssignedIdentities": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/UserIdentityProperties"
+          }
+        }
+      }
+    },
+    "NginxPrivateIPAllocationMethod": {
+      "enum": [
+        "Static",
+        "Dynamic"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "modelAsString": true,
+        "name": "NginxPrivateIPAllocationMethod"
+      }
+    },
+    "NginxPrivateIPAddress": {
+      "type": "object",
+      "properties": {
+        "privateIPAddress": {
+          "type": "string"
+        },
+        "privateIPAllocationMethod": {
+          "$ref": "#/definitions/NginxPrivateIPAllocationMethod"
+        },
+        "subnetId": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxPublicIPAddress": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxFrontendIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "publicIPAddresses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxPublicIPAddress"
+          },
+          "x-ms-identifiers": []
+        },
+        "privateIPAddresses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxPrivateIPAddress"
+          },
+          "x-ms-identifiers": []
+        }
+      }
+    },
+    "NginxNetworkInterfaceConfiguration": {
+      "type": "object",
+      "properties": {
+        "subnetId": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxNetworkProfile": {
+      "type": "object",
+      "properties": {
+        "frontEndIPConfiguration": {
+          "$ref": "#/definitions/NginxFrontendIPConfiguration"
+        },
+        "networkInterfaceConfiguration": {
+          "$ref": "#/definitions/NginxNetworkInterfaceConfiguration"
+        }
+      }
+    },
+    "NginxStorageAccount": {
+      "type": "object",
+      "properties": {
+        "accountName": {
+          "type": "string"
+        },
+        "containerName": {
+          "type": "string"
+        }
+      }
+    },
+    "NginxLogging": {
+      "type": "object",
+      "properties": {
+        "storageAccount": {
+          "$ref": "#/definitions/NginxStorageAccount"
+        }
+      }
+    },
+    "NginxDeploymentProperties": {
+      "type": "object",
+      "properties": {
+        "provisioningState": {
+          "$ref": "#/definitions/ProvisioningState"
+        },
+        "nginxVersion": {
+          "type": "string",
+          "readOnly": true
+        },
+        "managedResourceGroup": {
+          "type": "string",
+          "description": "The managed resource group to deploy VNet injection related network resources."
+        },
+        "networkProfile": {
+          "$ref": "#/definitions/NginxNetworkProfile"
+        },
+        "ipAddress": {
+          "type": "string",
+          "description": "The IP address of the deployment.",
+          "readOnly": true
+        },
+        "enableDiagnosticsSupport": {
+          "type": "boolean"
+        },
+        "logging": {
+          "$ref": "#/definitions/NginxLogging"
+        }
+      }
+    },
+    "NginxDeployment": {
+      "type": "object",
+      "x-ms-azure-resource": true,
+      "properties": {
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
+        "identity": {
+          "$ref": "#/definitions/IdentityProperties"
+        },
+        "properties": {
+          "$ref": "#/definitions/NginxDeploymentProperties"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "sku": {
+          "$ref": "#/definitions/ResourceSku"
+        },
+        "location": {
+          "type": "string"
+        },
+        "systemData": {
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "readOnly": true
+        }
+      }
+    },
+    "NginxDeploymentUpdateProperties": {
+      "type": "object",
+      "properties": {
+        "enableDiagnosticsSupport": {
+          "type": "boolean"
+        },
+        "logging": {
+          "$ref": "#/definitions/NginxLogging"
+        }
+      }
+    },
+    "NginxDeploymentUpdateParameters": {
+      "type": "object",
+      "properties": {
+        "identity": {
+          "$ref": "#/definitions/IdentityProperties"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "sku": {
+          "$ref": "#/definitions/ResourceSku"
+        },
+        "location": {
+          "type": "string"
+        },
+        "properties": {
+          "$ref": "#/definitions/NginxDeploymentUpdateProperties"
+        }
+      }
+    },
+    "NginxDeploymentListResponse": {
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NginxDeployment"
+          }
+        },
+        "nextLink": {
+          "type": "string"
+        }
+      }
+    },
+    "OperationDisplay": {
+      "description": "The object that represents the operation.",
+      "type": "object",
+      "properties": {
+        "provider": {
+          "description": "Service provider: Nginx.NginxPlus",
+          "type": "string"
+        },
+        "resource": {
+          "description": "Type on which the operation is performed, e.g., 'deployments'.",
+          "type": "string"
+        },
+        "operation": {
+          "description": "Operation type, e.g., read, write, delete, etc.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Description of the operation, e.g., 'Write deployments'.",
+          "type": "string"
+        }
+      }
+    },
+    "OperationResult": {
+      "description": "A Nginx.NginxPlus REST API operation.",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Operation name: {provider}/{resource}/{operation}",
+          "type": "string"
+        },
+        "display": {
+          "description": "The object that represents the operation.",
+          "$ref": "#/definitions/OperationDisplay"
+        },
+        "isDataAction": {
+          "description": "Indicates whether the operation is a data action",
+          "type": "boolean"
+        }
+      }
+    },
+    "OperationListResult": {
+      "description": "Result of GET request to list Nginx.NginxPlus operations.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "List of operations supported by the Nginx.NginxPlus provider.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OperationResult"
+          },
+          "x-ms-identifiers": []
+        },
+        "nextLink": {
+          "description": "URL to get the next set of operation list results if there are any.",
+          "type": "string"
+        }
+      }
+    }
+  },
+  "parameters": {
+    "DeploymentNameParameter": {
+      "in": "path",
+      "name": "deploymentName",
+      "description": "The name of targeted Nginx deployment",
+      "required": true,
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    }
+  }
+}
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
index ec2c12a42324..fedb7068ad97 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Get.json
similarity index 92%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Get.json
index 62dde467a650..b103c27f36ab 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_List.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_List.json
index aebf9d5f681c..e27f188defff 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
index 5e8c8ba7b286..e1d710256fc4 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Create.json
index 0bfb6ae74bfd..1dccfb52fa51 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Update.json
index 23c564edd085..ad53dc66e313 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/swagger.json
similarity index 97%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/swagger.json
index 564d6dcea2ed..239d319ec0d0 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given NGINX deployment",
+        "summary": "Get a certificate of given Nginx deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the NGINX certificates for given NGINX deployment",
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the NGINX deployment",
+        "summary": "Deletes a certificate from the Nginx deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given NGINX deployment",
+        "summary": "List all certificates of given Nginx deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the NGINX configuration of given NGINX deployment.",
+        "summary": "List the Nginx configuration of given Nginx deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the NGINX configuration of given NGINX deployment",
+        "summary": "Get the Nginx configuration of given Nginx deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the NGINX configuration for given NGINX deployment",
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The NGINX configuration",
+            "description": "The Nginx configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the NGINX deployment",
+        "summary": "Get the Nginx deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -524,7 +524,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the NGINX deployment",
+        "summary": "Create or update the Nginx deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -587,7 +587,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the NGINX deployment",
+        "summary": "Update the Nginx deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -647,7 +647,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the NGINX deployment resource",
+        "summary": "Delete the Nginx deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -696,7 +696,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the NGINX deployments resources",
+        "summary": "List the Nginx deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -738,7 +738,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all NGINX deployments under the specified resource group.",
+        "summary": "List all Nginx deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1394,7 +1394,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted NGINX deployment",
+      "description": "The name of targeted Nginx deployment",
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
index 572a7318eef0..95e26ed3613e 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Get.json
index 722510513dd7..6d39ccca313a 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_List.json
index d46cc0d9b30e..65502a0f044f 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Analysis.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Analysis.json
index 23a8c9565660..bdbd0c6ae700 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Analysis.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Analysis.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "config": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
index 5bc04c16378b..b36cb60e3274 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "body": {
+    "requestBody": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Create.json
index b2098c1d45c9..2874ef7d4dba 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Update.json
index c11ddc580188..de5df133ff93 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "body": {
+    "requestBody": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Operations_List.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/swagger.json
similarity index 96%
rename from specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
rename to specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/swagger.json
index 2d1d578487cf..0be627ee9aa8 100644
--- a/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
+++ b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given NGINX deployment",
+        "summary": "Get a certificate of given Nginx deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the NGINX certificates for given NGINX deployment",
+        "summary": "Create or update the Nginx certificates for given Nginx deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the NGINX deployment",
+        "summary": "Deletes a certificate from the Nginx deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given NGINX deployment",
+        "summary": "List all certificates of given Nginx deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the NGINX configuration of given NGINX deployment.",
+        "summary": "List the Nginx configuration of given Nginx deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the NGINX configuration of given NGINX deployment",
+        "summary": "Get the Nginx configuration of given Nginx deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the NGINX configuration for given NGINX deployment",
+        "summary": "Create or update the Nginx configuration for given Nginx deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The NGINX configuration",
+            "description": "The Nginx configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
+        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
+        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -502,7 +502,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -513,7 +513,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The NGINX configuration to analyze",
+            "description": "The Nginx configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -545,7 +545,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the NGINX deployment",
+        "summary": "Get the Nginx deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -588,7 +588,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the NGINX deployment",
+        "summary": "Create or update the Nginx deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -651,7 +651,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the NGINX deployment",
+        "summary": "Update the Nginx deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -711,7 +711,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the NGINX deployment resource",
+        "summary": "Delete the Nginx deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -760,7 +760,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the NGINX deployments resources",
+        "summary": "List the Nginx deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -802,7 +802,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all NGINX deployments under the specified resource group.",
+        "summary": "List all Nginx deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1464,14 +1464,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an NGINX configuration.",
+      "description": "The request body for creating an analysis for an Nginx configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
+              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1523,7 +1523,7 @@
     },
     "AnalysisError": {
       "type": "object",
-      "description": "An error object found during the analysis of an NGINX configuration.",
+      "description": "An error object found during the analysis of an Nginx configuration.",
       "required": [
         "directive",
         "description",
@@ -1569,7 +1569,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted NGINX deployment",
+      "description": "The name of targeted Nginx deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/readme.md b/specification/nginx/resource-manager/readme.md
index 5692b4f27b60..e8b8c10258bf 100644
--- a/specification/nginx/resource-manager/readme.md
+++ b/specification/nginx/resource-manager/readme.md
@@ -4,10 +4,10 @@
 
 This is the AutoRest configuration file for Nginx.
 
-
-
 ---
+
 ## Getting Started
+
 To build the SDK for Nginx, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,9 +19,8 @@ To see additional help and options, run:
 
 ## Configuration
 
-
-
 ### Basic Information
+
 These are the global settings for the Nginx API.
 
 ``` yaml
@@ -37,80 +36,80 @@ These settings apply only when `--tag=package-2025-03-01-preview` is specified o
 
 ```yaml $(tag) == 'package-2025-03-01-preview'
 input-file:
-  - NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
+  - Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
 
 suppressions:
   - code: GetCollectionResponseSchema
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
     reason: This is by design to avoid high bandwidth consumption as agreed with the partner
   - code: PutRequestResponseSchemeArm
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"].put
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"].put
   - code: PutRequestResponseSchemeArm
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"].put
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"].put
     reason: This is by design. We do not return provided file contents in the response. 
   - code: PutResponseCodes
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
     reason: This is a synchronous API returns a 200 as agreed with the partner. 
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/providers/NGINX.NGINXPLUS/operations"]
+    where: $.paths["/providers/Nginx.NginxPlus/operations"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/providers/NGINX.NGINXPLUS/nginxDeployments"]
+    where: $.paths["/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/certificates"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates/{certificateName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/certificates/{certificateName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}/analyze"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}/analyze"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/listDefaultWafPolicies"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/listDefaultWafPolicies"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies/{wafPolicyName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/wafPolicies/{wafPolicyName}"]
 ```
 
 ### Tag: package-2024-11-01-preview
@@ -119,7 +118,7 @@ These settings apply only when `--tag=package-2024-11-01-preview` is specified o
 
 ```yaml $(tag) == 'package-2024-11-01-preview'
 input-file:
-  - NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
+  - Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
 ```
 
 ### Tag: package-2024-09-01-preview
@@ -128,7 +127,7 @@ These settings apply only when `--tag=package-2024-09-01-preview` is specified o
 
 ```yaml $(tag) == 'package-2024-09-01-preview'
 input-file:
-  - NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
+  - Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
 ```
 
 ### Tag: package-2024-06-01-preview
@@ -137,17 +136,16 @@ These settings apply only when `--tag=package-2024-06-01-preview` is specified o
 
 ``` yaml $(tag) == 'package-2024-06-01-preview'
 input-file:
-- NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
+- Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
 ```
 
-
 ### Tag: package-2024-01-01-preview
 
 These settings apply only when `--tag=package-2024-01-01-preview` is specified on the command line.
 
 ``` yaml $(tag) == 'package-2024-01-01-preview'
 input-file:
-- NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
+- Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
 ```
 
 ### Tag: package-2023-09-01
@@ -156,17 +154,25 @@ These settings apply only when `--tag=package-2023-09-01` is specified on the co
 
 ``` yaml $(tag) == 'package-2023-09-01'
 input-file:
-- NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
+- Nginx.NginxPlus/stable/2023-09-01/swagger.json
 ```
 
-
 ### Tag: package-2023-04-01
 
 These settings apply only when `--tag=package-2023-04-01` is specified on the command line.
 
 ``` yaml $(tag) == 'package-2023-04-01'
 input-file:
-- NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
+- Nginx.NginxPlus/stable/2023-04-01/swagger.json
+```
+
+### Tag: package-2022-11-01-preview
+
+These settings apply only when `--tag=package-2022-11-01-preview` is specified on the command line.
+
+``` yaml $(tag) == 'package-2022-11-01-preview'
+input-file:
+- Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
 ```
 
 ### Tag: package-2022-08-01
@@ -175,7 +181,7 @@ These settings apply only when `--tag=package-2022-08-01` is specified on the co
 
 ``` yaml $(tag) == 'package-2022-08-01'
 input-file:
-- NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
+- Nginx.NginxPlus/stable/2022-08-01/swagger.json
 ```
 
 ### Tag: package-2021-05-01-preview
@@ -184,16 +190,18 @@ These settings apply only when `--tag=package-2021-05-01-preview` is specified o
 
 ``` yaml $(tag) == 'package-2021-05-01-preview'
 input-file:
-- NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
+- Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
 ```
 
 ## Suppression
+
 ``` yaml
 directive:
   - suppress: PutRequestResponseSchemeArm
     from: swagger.json
     reason: Temporary suppression needed to avoid delays for business needs and maintain production timelines. It's also approved before in previous PR in private repo.
-```    
+```
+
 ---
 
 # Code Generation
@@ -233,4 +241,4 @@ See configuration in [readme.java.md](./readme.java.md)
 
 ## TypeScript
 
-See configuration in [readme.typescript.md](./readme.typescript.md)
\ No newline at end of file
+See configuration in [readme.typescript.md](./readme.typescript.md)

From 0e32c078aa7f83923eaa54dea0e09728a02cce35 Mon Sep 17 00:00:00 2001
From: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:48:33 -0700
Subject: [PATCH 19/34] Allow summarize-checks to handle huge number of
 triggered checkruns for a given SHA (#36474)

* we now pull the most recent 1k checkRuns for a SHA using checks.listForRef and the most recent commit statatuses via repos.listCommitStatusesForRef
* after we combine those into a set of "checks", we then discover the targeted branch from the `impactAssessment` wf if it exists
* once we have a targetedBranch, we can pull down the branchProtectionRules from the repo
* once we have a set of branchProtectionRules, we can now correlate the suite of checkRuns by whether or not they are required
* return that same data that was once handled by a single graphQL. The benefit of all this is that we can no longer hit the secondary rate limiting error that we were guaranteed to run into for SHAs with hilariously huge numbers of associated checkruns.
---
 .../src/summarize-checks/summarize-checks.js  | 461 +++++++++---------
 .../summarize-checks/summarize-checks.test.js |  18 +-
 2 files changed, 218 insertions(+), 261 deletions(-)

diff --git a/.github/workflows/src/summarize-checks/summarize-checks.js b/.github/workflows/src/summarize-checks/summarize-checks.js
index 7678f5d5b011..388c6fed83be 100644
--- a/.github/workflows/src/summarize-checks/summarize-checks.js
+++ b/.github/workflows/src/summarize-checks/summarize-checks.js
@@ -24,6 +24,7 @@ import { extractInputs } from "../context.js";
 import { execFile } from "../../../shared/src/exec.js";
 import { CheckConclusion, PER_PAGE_MAX } from "../../../shared/src/github.js";
 import { intersect } from "../../../shared/src/set.js";
+import { byDate, invert } from "../../../shared/src/sort.js";
 import {
   brChRevApproval,
   getViolatedRequiredLabelsRules,
@@ -57,7 +58,7 @@ import path from "path";
  * @typedef {Object} CheckRunData
  * @property {string} name
  * @property {string} status
- * @property {string} conclusion
+ * @property {string | null} conclusion
  * @property {CheckMetadata} checkInfo
  */
 
@@ -568,129 +569,24 @@ export function updateLabels(existingLabels, impactAssessment) {
 
 // #endregion
 // #region checks
-
-/**
- * A GraphQL query to GitHub API that returns all check runs for given commit, with "isRequired" field for given PR.
- *
- * If you want to see example response, copy the query body into this:
- * https://docs.github.com/en/graphql/overview/explorer
- * Example inputs:
- * resourceUrl: "https://github.com/test-repo-billy/azure-rest-api-specs/commit/c2789c5bde1b3f4fa34f76a8eeaaed479df23c4d"
- * prNumber: 2996
- *
- * Reference:
- * https://docs.github.com/en/graphql/reference/queries#resource
- * https://docs.github.com/en/graphql/guides/using-global-node-ids#3-do-a-direct-node-lookup-in-graphql
- * https://docs.github.com/en/graphql/reference/objects#checkrun
- * Rate limit:
- * https://docs.github.com/en/graphql/overview/resource-limitations#rate-limit
- * https://docs.github.com/en/graphql/reference/objects#ratelimit
- *
- * Note: here, for "checkRuns(first: ..)", maybe we should add a filter that filters to LATEST, per:
- * https://docs.github.com/en/graphql/reference/input-objects#checkrunfilter
- * https://docs.github.com/en/graphql/reference/enums#checkruntype
- **/
 /**
- * Fetch all check suites for a commit with pagination
- * @param {import('@actions/github-script').AsyncFunctionArguments['github']} github
- * @param {typeof import("@actions/core")} core
- * @param {string} owner
- * @param {string} repo
- * @param {string} sha
- * @param {number} prNumber
- * @returns {Promise<any>} Complete GraphQL response with all check suites
+ * Extracts required status check context names from GitHub branch rules response.
+ * @param {import('@octokit/rest').RestEndpointMethodTypes['repos']['getBranchRules']['response']} checkResponseObj - The GitHub branch rules API response object
+ * @returns {string[]} Array of required status check context names (e.g., ["license/cla", "Swagger LintDiff"])
  */
-async function getAllCheckSuites(github, core, owner, repo, sha, prNumber) {
-  // First, get the total count using REST API to avoid expensive GraphQL if there are too many suites
-  const { data: checkSuitesResponse } = await github.rest.checks.listSuitesForRef({
-    owner,
-    repo,
-    ref: sha,
-    per_page: 1, // We only need the count, not the actual data
-  });
-
-  const totalCheckSuites = checkSuitesResponse.total_count;
-
-  // Bail if too many check suites to avoid burning GraphQL rate limits
-  if (totalCheckSuites > 500) {
-    throw new Error(
-      `Too many check suites (${totalCheckSuites}) for ${owner}/${repo}#${prNumber}@${sha}. Summarize-Checks ending with error to avoid exhausting graphQL resources.`,
-    );
-  } else {
-    core.info(`Found ${totalCheckSuites} total check suites`);
-  }
-
-  // Now proceed with GraphQL pagination
-  const resourceUrl = `https://github.com/${owner}/${repo}/commit/${sha}`;
-  let allCheckSuites = [];
-  let hasNextPage = true;
-  let cursor = null;
-  let lastResponse = null;
-
-  while (hasNextPage) {
-    /** @type {string} */
-    const query = `
-      {
-        resource(url: "${resourceUrl}") {
-          ... on Commit {
-            checkSuites(first: 100${cursor ? `, after: "${cursor}"` : ""}) {
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-              nodes {
-                workflowRun {
-                  id
-                  databaseId
-                  workflow {
-                    name
-                  }
-                }
-                checkRuns(first: 100) {
-                  nodes {
-                    name
-                    status
-                    conclusion
-                    isRequired(pullRequestNumber: ${prNumber})
-                  }
-                }
-              }
-            }
-          }
-        }
-        rateLimit {
-          limit
-          cost
-          used
-          remaining
-          resetAt
-        }
+export function getRequiredChecksFromBranchRuleOutput(checkResponseObj) {
+  const requiredChecks = [];
+
+  // Look through all rules for required_status_checks type
+  for (const rule of checkResponseObj.data) {
+    if (rule.type === "required_status_checks" && rule.parameters?.required_status_checks) {
+      for (const statusCheck of rule.parameters.required_status_checks) {
+        requiredChecks.push(statusCheck.context);
       }
-    `;
-
-    /** @type {any} */
-    const response = await github.graphql(query);
-    lastResponse = response;
-    core.info(`GraphQL Rate Limit Information: ${JSON.stringify(response.rateLimit)}`);
-
-    if (response.resource?.checkSuites?.nodes) {
-      allCheckSuites.push(...response.resource.checkSuites.nodes);
-      hasNextPage = response.resource.checkSuites.pageInfo.hasNextPage;
-      cursor = response.resource.checkSuites.pageInfo.endCursor;
-    } else {
-      hasNextPage = false;
     }
   }
 
-  // Return a response object that matches the original structure
-  return {
-    resource: {
-      checkSuites: {
-        nodes: allCheckSuites,
-      },
-    },
-    rateLimit: lastResponse?.rateLimit,
-  };
+  return requiredChecks;
 }
 
 /**
@@ -714,10 +610,8 @@ export async function getCheckRunTuple(
 ) {
   // This function was originally a version of getRequiredAndFyiAndAutomatedMergingRequirementsMetCheckRuns
   // but has been simplified for clarity and purpose.
-  /** @type {CheckRunData[]} */
-  let reqCheckRuns = [];
-  /** @type {CheckRunData[]} */
-  let fyiCheckRuns = [];
+  /** @type {string[]} */
+  let requiredCheckNames = [];
 
   /** @type {number | undefined} */
   let impactAssessmentWorkflowRun = undefined;
@@ -725,11 +619,150 @@ export async function getCheckRunTuple(
   /** @type { import("./labelling.js").ImpactAssessment | undefined } */
   let impactAssessment = undefined;
 
-  const response = await getAllCheckSuites(github, core, owner, repo, head_sha, prNumber);
-  core.info(`GraphQL Rate Limit Information: ${JSON.stringify(response.rateLimit)}`);
+  const allCheckRuns = await github.paginate(github.rest.checks.listForRef, {
+    owner: owner,
+    repo: repo,
+    ref: head_sha,
+    per_page: PER_PAGE_MAX,
+  });
+
+  const allCommitStatuses = await github.paginate(github.rest.repos.listCommitStatusesForRef, {
+    owner: owner,
+    repo: repo,
+    ref: head_sha,
+    per_page: PER_PAGE_MAX,
+  });
+
+  // Process allCheckRuns and allCommitStatuses into unified CheckRunData array
+  // all checks will be considered as "FYI" until we have an impact assessment, so we can
+  // determine the target branch, and from there pull branch protect rulesets to ensure we
+  // are marking the required checks correctly.
+  /** @type {Array<CheckRunData & {_originalData: any, _source: string}>} */
+  const allChecks = [];
+
+  allCheckRuns.forEach((checkRun) => {
+    allChecks.push({
+      name: checkRun.name,
+      status: checkRun.status,
+      conclusion: checkRun.conclusion || null,
+      checkInfo: getCheckInfo(checkRun.name),
+      // Store original object for date sorting
+      _originalData: checkRun,
+      _source: "checkRun",
+    });
+  });
 
-  [reqCheckRuns, fyiCheckRuns, impactAssessmentWorkflowRun] =
-    extractRunsFromGraphQLResponse(response);
+  allCommitStatuses.forEach((status) => {
+    // Map commit status state to check run conclusion
+    let conclusion = null;
+    let checkStatus = "completed";
+
+    switch (status.state) {
+      case "success":
+        conclusion = "success";
+        break;
+      case "failure":
+        conclusion = "failure";
+        break;
+      case "error":
+        conclusion = "failure";
+        break;
+      case "pending":
+        checkStatus = "in_progress";
+        conclusion = null;
+        break;
+    }
+
+    allChecks.push({
+      name: status.context,
+      status: checkStatus,
+      conclusion: conclusion,
+      checkInfo: getCheckInfo(status.context),
+      // Store original object for date sorting and data access
+      _originalData: status,
+      _source: "commitStatus",
+    });
+  });
+
+  // Group by name and take the latest for each
+  const checksByName = new Map();
+
+  allChecks.forEach((check) => {
+    const name = check.name;
+    if (!checksByName.has(name)) {
+      checksByName.set(name, []);
+    }
+    checksByName.get(name).push(check);
+  });
+
+  // For each group, sort by date (newest first) and take the first one
+  const unifiedCheckRuns = [];
+  for (const [, checks] of checksByName) {
+    // Sort by date - newest first using invert(byDate(...))
+    const sortedChecks = checks.sort(
+      invert(
+        byDate((check) => {
+          if (check._source === "checkRun") {
+            // Check runs have started_at, completed_at, etc. Use the most recent available date
+            return (
+              check._originalData.completed_at ||
+              check._originalData.started_at ||
+              check._originalData.created_at
+            );
+          } else {
+            // Commit statuses have created_at and updated_at
+            return check._originalData.updated_at || check._originalData.created_at;
+          }
+        }),
+      ),
+    );
+
+    const latestCheck = sortedChecks[0];
+
+    // just handling both for ease of integration testing
+    if (
+      latestCheck.name === "[TEST-IGNORE] Summarize PR Impact" ||
+      latestCheck.name === "Summarize PR Impact"
+    ) {
+      const workflowRuns = await github.paginate(github.rest.actions.listWorkflowRunsForRepo, {
+        owner,
+        repo,
+        head_sha: head_sha,
+        check_suite_id: latestCheck._originalData.check_suite.id,
+        per_page: PER_PAGE_MAX,
+      });
+
+      if (workflowRuns.length === 0) {
+        core.warning(
+          `No workflow runs found for check suite ID: ${latestCheck._originalData.check_suite.id}`,
+        );
+      } else {
+        // Sort by updated_at to get the most recent run
+        const sortedRuns = workflowRuns.sort(
+          (a, b) => new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime(),
+        );
+        impactAssessmentWorkflowRun = sortedRuns[0].id;
+
+        if (workflowRuns.length > 1) {
+          core.info(
+            `Found ${workflowRuns.length} workflow runs for check suite ID: ${latestCheck._originalData.check_suite.id}, using most recent: ${sortedRuns[0].id}`,
+          );
+        }
+      }
+    }
+
+    // Create clean CheckRunData without temporary properties
+    unifiedCheckRuns.push({
+      name: latestCheck.name,
+      status: latestCheck.status,
+      conclusion: latestCheck.conclusion,
+      checkInfo: latestCheck.checkInfo,
+    });
+  }
+
+  core.info(
+    `Processed ${allCheckRuns.length} check runs and ${allCommitStatuses.length} commit statuses into ${unifiedCheckRuns.length} unified checks`,
+  );
 
   if (impactAssessmentWorkflowRun) {
     core.info(
@@ -742,13 +775,27 @@ export async function getCheckRunTuple(
       repo,
       impactAssessmentWorkflowRun,
     );
+
+    const branchRules = await github.rest.repos.getBranchRules({
+      owner: owner,
+      repo: repo,
+      branch: impactAssessment.targetBranch,
+    });
+
+    if (branchRules) {
+      requiredCheckNames = getRequiredChecksFromBranchRuleOutput(branchRules);
+    }
   }
 
-  const filteredReqCheckRuns = reqCheckRuns.filter(
-    (checkRun) => !excludedCheckNames.includes(checkRun.name),
+  const filteredReqCheckRuns = unifiedCheckRuns.filter(
+    (checkRun) =>
+      !excludedCheckNames.includes(checkRun.name) && requiredCheckNames.includes(checkRun.name),
   );
-  const filteredFyiCheckRuns = fyiCheckRuns.filter(
-    (checkRun) => !excludedCheckNames.includes(checkRun.name),
+  const filteredFyiCheckRuns = unifiedCheckRuns.filter(
+    (checkRun) =>
+      !excludedCheckNames.includes(checkRun.name) &&
+      !requiredCheckNames.includes(checkRun.name) &&
+      FYI_CHECK_NAMES.includes(checkRun.name),
   );
 
   return [filteredReqCheckRuns, filteredFyiCheckRuns, impactAssessment];
@@ -775,76 +822,6 @@ export function checkRunIsSuccessful(checkRun) {
   return conclusion === "success" || conclusion === "neutral";
 }
 
-/**
- * @param {any} response - GraphQL response data
- * @returns {[CheckRunData[], CheckRunData[], number | undefined]}
- */
-export function extractRunsFromGraphQLResponse(response) {
-  /** @type {CheckRunData[]} */
-  const reqCheckRuns = [];
-  /** @type {CheckRunData[]} */
-  const fyiCheckRuns = [];
-
-  /** @type {number | undefined} */
-  let impactAssessmentWorkflowRun = undefined;
-
-  // Define the automated merging requirements check name
-
-  if (response.resource?.checkSuites?.nodes) {
-    response.resource.checkSuites.nodes.forEach(
-      /** @param {{ workflowRun?: WorkflowRunInfo, checkRuns?: { nodes?: any[] } }} checkSuiteNode */
-      (checkSuiteNode) => {
-        if (checkSuiteNode.checkRuns?.nodes) {
-          checkSuiteNode.checkRuns.nodes.forEach((checkRunNode) => {
-            if (checkRunNode.isRequired) {
-              reqCheckRuns.push({
-                name: checkRunNode.name,
-                status: checkRunNode.status,
-                conclusion: checkRunNode.conclusion,
-                checkInfo: getCheckInfo(checkRunNode.name),
-              });
-            }
-            // Note the "else" here. It means that:
-            // A GH check will be bucketed into "failing FYI check run" if:
-            // - It is failing
-            // - AND it is is NOT marked as 'required' in GitHub branch policy
-            // - AND it is marked as 'FYI' in this file's FYI_CHECK_NAMES array
-            else if (FYI_CHECK_NAMES.includes(checkRunNode.name)) {
-              fyiCheckRuns.push({
-                name: checkRunNode.name,
-                status: checkRunNode.status,
-                conclusion: checkRunNode.conclusion,
-                checkInfo: getCheckInfo(checkRunNode.name),
-              });
-            }
-          });
-        }
-      },
-    );
-  }
-
-  // extract the ImpactAssessment check run if it is completed and successful
-  if (response.resource?.checkSuites?.nodes) {
-    response.resource.checkSuites.nodes.forEach(
-      /** @param {{ workflowRun?: WorkflowRunInfo, checkRuns?: { nodes?: any[] } }} checkSuiteNode */
-      (checkSuiteNode) => {
-        if (checkSuiteNode.checkRuns?.nodes) {
-          checkSuiteNode.checkRuns.nodes.forEach((checkRunNode) => {
-            if (
-              checkRunNode.name === "[TEST-IGNORE] Summarize PR Impact" &&
-              checkRunNode.status?.toLowerCase() === "completed" &&
-              checkRunNode.conclusion?.toLowerCase() === "success"
-            ) {
-              // Assign numeric databaseId, not the string node ID
-              impactAssessmentWorkflowRun = checkSuiteNode.workflowRun?.databaseId;
-            }
-          });
-        }
-      },
-    );
-  }
-  return [reqCheckRuns, fyiCheckRuns, impactAssessmentWorkflowRun];
-}
 /**
  * Get metadata for a specific check from our index.
  * @param {string} checkName
@@ -1131,55 +1108,51 @@ function buildViolatedLabelRulesNextStepsText(violatedRequiredLabelsRules) {
  * @param {string} owner
  * @param {string} repo
  * @param {number} runId - The workflow run databaseId
- * @returns {Promise<import("./labelling.js").ImpactAssessment | undefined>} The parsed job summary data
+ * @returns {Promise<import("./labelling.js").ImpactAssessment>} The parsed job summary data
  */
 export async function getImpactAssessment(github, core, owner, repo, runId) {
-  try {
-    // List artifacts for provided workflow run
-    const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
-      owner,
-      repo,
-      run_id: runId,
-    });
+  // List artifacts for provided workflow run
+  const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+    owner,
+    repo,
+    run_id: runId,
+  });
 
-    // Find the job-summary artifact
-    const jobSummaryArtifact = artifacts.data.artifacts.find(
-      (artifact) => artifact.name === "job-summary",
-    );
+  // Find the job-summary artifact
+  const jobSummaryArtifact = artifacts.data.artifacts.find(
+    (artifact) => artifact.name === "job-summary",
+  );
 
-    if (!jobSummaryArtifact) {
-      core.info("No job-summary artifact found");
-      return undefined;
-    }
+  if (!jobSummaryArtifact) {
+    throw new Error(
+      `Unable to find job-summary artifact for run ID: ${runId}. This should never happen, as this section of code should only run with a valid runId.`,
+    );
+  }
 
-    // Download the artifact as a zip archive
-    const download = await github.rest.actions.downloadArtifact({
-      owner,
-      repo,
-      artifact_id: jobSummaryArtifact.id,
-      archive_format: "zip",
-    });
+  // Download the artifact as a zip archive
+  const download = await github.rest.actions.downloadArtifact({
+    owner,
+    repo,
+    artifact_id: jobSummaryArtifact.id,
+    archive_format: "zip",
+  });
 
-    core.info(`Successfully downloaded job-summary artifact ID: ${jobSummaryArtifact.id}`);
-
-    // Write zip buffer to temp file and extract JSON
-    const tmpZip = path.join(process.env.RUNNER_TEMP || os.tmpdir(), `job-summary-${runId}.zip`);
-    // Convert ArrayBuffer to Buffer
-    // Convert ArrayBuffer (download.data) to Node Buffer
-    const arrayBuffer = /** @type {ArrayBuffer} */ (download.data);
-    const zipBuffer = Buffer.from(new Uint8Array(arrayBuffer));
-    await fs.writeFile(tmpZip, zipBuffer);
-    // Extract JSON content from zip archive
-    const { stdout: jsonContent } = await execFile("unzip", ["-p", tmpZip]);
-    await fs.unlink(tmpZip);
-
-    /** @type {import("./labelling.js").ImpactAssessment} */
-    // todo: we need to zod this to ensure the structure is correct, however we do not have zod installed at time of run
-    const impact = JSON.parse(jsonContent);
-    return impact;
-  } catch (/** @type {any} */ error) {
-    core.error(`Failed to download job summary artifact: ${error.message}`);
-    return undefined;
-  }
+  core.info(`Successfully downloaded job-summary artifact ID: ${jobSummaryArtifact.id}`);
+
+  // Write zip buffer to temp file and extract JSON
+  const tmpZip = path.join(process.env.RUNNER_TEMP || os.tmpdir(), `job-summary-${runId}.zip`);
+  // Convert ArrayBuffer to Buffer
+  // Convert ArrayBuffer (download.data) to Node Buffer
+  const arrayBuffer = /** @type {ArrayBuffer} */ (download.data);
+  const zipBuffer = Buffer.from(new Uint8Array(arrayBuffer));
+  await fs.writeFile(tmpZip, zipBuffer);
+  // Extract JSON content from zip archive
+  const { stdout: jsonContent } = await execFile("unzip", ["-p", tmpZip]);
+  await fs.unlink(tmpZip);
+
+  /** @type {import("./labelling.js").ImpactAssessment} */
+  // todo: we need to zod this to ensure the structure is correct, however we do not have zod installed at time of run
+  const impact = JSON.parse(jsonContent);
+  return impact;
 }
 // #endregion
diff --git a/.github/workflows/test/summarize-checks/summarize-checks.test.js b/.github/workflows/test/summarize-checks/summarize-checks.test.js
index 08a46096cb8a..2e716d5ab9ee 100644
--- a/.github/workflows/test/summarize-checks/summarize-checks.test.js
+++ b/.github/workflows/test/summarize-checks/summarize-checks.test.js
@@ -3,7 +3,6 @@ import { describe, expect, it } from "vitest";
 import { processArmReviewLabels } from "../../src/summarize-checks/labelling.js";
 import {
   createNextStepsComment,
-  extractRunsFromGraphQLResponse,
   getCheckInfo,
   getCheckRunTuple,
   getExistingLabels,
@@ -105,6 +104,7 @@ describe("Summarize Checks Integration Tests", () => {
           pr.base.ref,
           requiredCheckRuns,
           fyiCheckRuns,
+          impactAssessment !== undefined,
         );
 
         const actualLabels = [...labelContext.toAdd, ...labelContext.present];
@@ -854,22 +854,6 @@ describe("Summarize Checks Unit Tests", () => {
 
       expect(automatedCheckOutput).toEqual(expectedCheckOutput);
     });
-
-    it("should extract check info from raw check response data", async () => {
-      const expectedCheckRunId = 16582733356;
-      const response = await import("./fixtures/RawGraphQLResponse.json", {
-        assert: { type: "json" },
-      });
-      const [requiredCheckRuns, fyiCheckRuns, impactAssessmentWorkflowId] =
-        await extractRunsFromGraphQLResponse(response);
-
-      expect(requiredCheckRuns).toBeDefined();
-      expect(fyiCheckRuns).toBeDefined();
-      expect(impactAssessmentWorkflowId).toBeDefined();
-      expect(requiredCheckRuns.length).toEqual(11);
-      expect(fyiCheckRuns.length).toEqual(0);
-      expect(impactAssessmentWorkflowId).toEqual(expectedCheckRunId);
-    });
   });
 
   describe("update labels", () => {

From 04214f1010d6aac9ec61dd5dd7fe303526f00ee5 Mon Sep 17 00:00:00 2001
From: Scott Beddall <45376673+scbedd@users.noreply.github.com>
Date: Wed, 6 Aug 2025 11:44:28 -0700
Subject: [PATCH 20/34] when extracting `Summarize PR Impact` workflowrunId, we
 should only examine successful completed runs (#36494)

* 1) filter on only completed summarize PR Impact runs. 2) if there is no impactAssessmentWorkflowRun that is successful and completed, we will default to required checknames of Summarize PR Impact
---
 .../workflows/src/summarize-checks/summarize-checks.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/src/summarize-checks/summarize-checks.js b/.github/workflows/src/summarize-checks/summarize-checks.js
index 388c6fed83be..afa683e03d63 100644
--- a/.github/workflows/src/summarize-checks/summarize-checks.js
+++ b/.github/workflows/src/summarize-checks/summarize-checks.js
@@ -719,10 +719,12 @@ export async function getCheckRunTuple(
 
     const latestCheck = sortedChecks[0];
 
-    // just handling both for ease of integration testing
+    // just handling both names for ease of integration testing
     if (
-      latestCheck.name === "[TEST-IGNORE] Summarize PR Impact" ||
-      latestCheck.name === "Summarize PR Impact"
+      (latestCheck.name === "[TEST-IGNORE] Summarize PR Impact" ||
+        latestCheck.name === "Summarize PR Impact") &&
+      latestCheck.status === "completed" &&
+      latestCheck.conclusion === "success"
     ) {
       const workflowRuns = await github.paginate(github.rest.actions.listWorkflowRunsForRepo, {
         owner,
@@ -785,6 +787,8 @@ export async function getCheckRunTuple(
     if (branchRules) {
       requiredCheckNames = getRequiredChecksFromBranchRuleOutput(branchRules);
     }
+  } else {
+    requiredCheckNames = ["Summarize PR Impact", "[TEST-IGNORE] Summarize PR Impact"];
   }
 
   const filteredReqCheckRuns = unifiedCheckRuns.filter(

From 4901544be58eaaad596880034b1e0024f247b261 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 6 Aug 2025 12:16:51 -0700
Subject: [PATCH 21/34] Source user object id directly instead of with graph
 (#36464)

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
---
 .../TestResources/New-TestResources.ps1       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
index 078991250e64..03410278dd3a 100755
--- a/eng/common/TestResources/New-TestResources.ps1
+++ b/eng/common/TestResources/New-TestResources.ps1
@@ -353,15 +353,12 @@ try {
     # Make sure the provisioner OID is set so we can pass it through to the deployment.
     if (!$ProvisionerApplicationId -and !$ProvisionerApplicationOid) {
         if ($context.Account.Type -eq 'User') {
-            # Support corp tenant and TME tenant user id lookups
-            $user = Get-AzADUser -Mail $context.Account.Id
-            if ($null -eq $user -or !$user.Id) {
-                $user = Get-AzADUser -UserPrincipalName $context.Account.Id
-            }
-            if ($null -eq $user -or !$user.Id) {
+            # HomeAccountId format is '<object id>.<tenant id>'
+            $userAccountId = (Get-AzContext).Account.ExtendedProperties.HomeAccountId.Split('.')[0]
+            if ($null -eq $userAccountId) {
                 throw "Failed to find entra object ID for the current user"
             }
-            $ProvisionerApplicationOid = $user.Id
+            $ProvisionerApplicationOid = $userAccountId
         } elseif ($context.Account.Type -eq 'ServicePrincipal') {
             $sp = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
             $ProvisionerApplicationOid = $sp.Id
@@ -431,17 +428,14 @@ try {
             Write-Warning "The specified TestApplicationId '$TestApplicationId' will be ignored when -ServicePrincipalAutth is not set."
         }
 
-        # Support corp tenant and TME tenant user id lookups
-        $userAccount = (Get-AzADUser -Mail (Get-AzContext).Account.Id)
-        if ($null -eq $userAccount -or !$userAccount.Id) {
-            $userAccount = (Get-AzADUser -UserPrincipalName (Get-AzContext).Account)
-        }
-        if ($null -eq $userAccount -or !$userAccount.Id) {
+        $userAccountName = (Get-AzContext).Account.Id
+        # HomeAccountId format is '<object id>.<tenant id>'
+        $userAccountId = (Get-AzContext).Account.ExtendedProperties.HomeAccountId.Split('.')[0]
+        if ($null -eq $userAccountId) {
             throw "Failed to find entra object ID for the current user"
         }
-        $TestApplicationOid = $userAccount.Id
+        $TestApplicationOid = $userAccountId
         $TestApplicationId = $testApplicationOid
-        $userAccountName = $userAccount.UserPrincipalName
         Log "User authentication with user '$userAccountName' ('$TestApplicationId') will be used."
     }
     # If user has specified -ServicePrincipalAuth

From 881ba939df54bac44dd59da90383513cab22cf58 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 6 Aug 2025 15:46:37 -0700
Subject: [PATCH 22/34] [context.js] Flow head-sha like issue-number (#36479)

- Fixes #36477
- Adds artifact head-sha anywhere we added issue-number
---
 .github/shared/src/git.js                     |  11 ++
 .github/shared/test/examples.js               |   2 +
 .github/shared/test/git.test.js               |  25 +++++
 .../workflows/_reusable-set-check-status.yaml |   7 ++
 .github/workflows/arm-auto-signoff.yaml       |  21 +++-
 .../breaking-change-add-label-artifacts.yaml  |   7 ++
 .../workflows/sdk-breaking-change-labels.yaml |  12 +-
 .github/workflows/spec-gen-sdk-status.yml     |   7 ++
 .github/workflows/src/arm-auto-signoff.js     |   5 +-
 .../breaking-change-add-label-artifacts.js    |   1 +
 .github/workflows/src/context.js              |  37 ++++--
 .github/workflows/src/set-status.js           |   7 +-
 .github/workflows/src/spec-gen-sdk-status.js  |   1 +
 .../workflows/test/arm-auto-signoff.test.js   |  20 ++--
 ...reaking-change-add-label-artifacts.test.js |   1 +
 .github/workflows/test/context.test.js        |  57 ++++++++--
 .github/workflows/test/set-status.test.js     | 105 +++++-------------
 .../test/spec-gen-sdk-status.test.js          |   4 +
 .../src/command-helpers.ts                    |   1 +
 eng/tools/spec-gen-sdk-runner/src/types.ts    |   1 +
 .../test/command-helpers.test.ts              |   6 +-
 21 files changed, 222 insertions(+), 116 deletions(-)
 create mode 100644 .github/shared/src/git.js
 create mode 100644 .github/shared/test/git.test.js

diff --git a/.github/shared/src/git.js b/.github/shared/src/git.js
new file mode 100644
index 000000000000..9ab7cab1d2d6
--- /dev/null
+++ b/.github/shared/src/git.js
@@ -0,0 +1,11 @@
+// @ts-check
+
+/**
+ * Returns true if a string is a possible full git SHA (40 hex chars, case insensitive)
+ *
+ * @param {string} string
+ * @returns {boolean}
+ */
+export function isFullGitSha(string) {
+  return /^[0-9a-f]{40}$/i.test(string);
+}
diff --git a/.github/shared/test/examples.js b/.github/shared/test/examples.js
index 12336f56be2f..d8924c0183d7 100644
--- a/.github/shared/test/examples.js
+++ b/.github/shared/test/examples.js
@@ -1,5 +1,7 @@
 // @ts-check
 
+export const fullGitSha = "abc123abc123abc123abc123abc123abc123abc1";
+
 export const swaggerHandWritten = JSON.stringify("foo");
 
 export const swaggerTypeSpecGenerated = JSON.stringify({
diff --git a/.github/shared/test/git.test.js b/.github/shared/test/git.test.js
new file mode 100644
index 000000000000..d5e08121e2a4
--- /dev/null
+++ b/.github/shared/test/git.test.js
@@ -0,0 +1,25 @@
+// @ts-check
+
+import { describe, expect, it } from "vitest";
+import { isFullGitSha } from "../src/git";
+import { fullGitSha } from "./examples";
+
+describe("git", () => {
+  it.each([
+    [undefined, false],
+    [null, false],
+    ["", false],
+    // Short SHAs of 7 chars are not valid
+    ["abc1234", false],
+    // Invalid hex chars
+    ["aBcDeG0189".repeat(4), false],
+    ["aBcDe 0189".repeat(4), false],
+    ["aBcDe_0189".repeat(4), false],
+    // Valid
+    ["aBcDeF0189".repeat(4), true],
+    [fullGitSha, true],
+  ])("isFullGitSha(%o) => %o", (string, result) => {
+    // @ts-expect-error Testing invalid input types
+    expect(isFullGitSha(string)).toBe(result);
+  });
+});
diff --git a/.github/workflows/_reusable-set-check-status.yaml b/.github/workflows/_reusable-set-check-status.yaml
index 9798dce2a0a2..1f4c1779f964 100644
--- a/.github/workflows/_reusable-set-check-status.yaml
+++ b/.github/workflows/_reusable-set-check-status.yaml
@@ -68,6 +68,13 @@ jobs:
               '${{ inputs.overriding_label }}'
             );
 
+      - if: ${{ always() && steps.set-status.outputs.head_sha }}
+        name: Upload artifact with head SHA
+        uses: ./.github/actions/add-empty-artifact
+        with:
+          name: head-sha
+          value: ${{ steps.set-status.outputs.head_sha }}
+
       - if: ${{ always() && steps.set-status.outputs.issue_number }}
         name: Upload artifact with issue number
         uses: ./.github/actions/add-empty-artifact
diff --git a/.github/workflows/arm-auto-signoff.yaml b/.github/workflows/arm-auto-signoff.yaml
index ca099c309749..d7eea4313dce 100644
--- a/.github/workflows/arm-auto-signoff.yaml
+++ b/.github/workflows/arm-auto-signoff.yaml
@@ -97,15 +97,28 @@ jobs:
           # Convert "add/remove" to "true/false"
           value: "${{ fromJson(steps.get-label-action.outputs.result).labelAction == 'add' }}"
 
+      # Required for consumers to identify the head SHA associated with this workflow run.
+      # Output can be trusted, because it was uploaded from a workflow that is trusted,
+      # because "issue_comment", and "workflow_run" only trigger on workflows in the default branch.
+      # Consumers should verify the "event_name" before attempting to extract from the artifact name.
+      - if: |
+          always() &&
+          (github.event_name == 'issue_comment' || github.event_name == 'workflow_run') &&
+          fromJson(steps.get-label-action.outputs.result).headSha
+        name: Upload artifact with head SHA
+        uses: ./.github/actions/add-empty-artifact
+        with:
+          name: "head-sha"
+          value: "${{ fromJson(steps.get-label-action.outputs.result).headSha }}"
+
       # Required for consumers to identify the PR associated with this workflow run.
       # Output can be trusted, because it was uploaded from a workflow that is trusted,
       # because "issue_comment", and "workflow_run" only trigger on workflows in the default branch.
       # Consumers should verify the "event_name" before attempting to extract from the artifact name.
       - if: |
-          (github.event_name == 'issue_comment' || 
-           github.event_name == 'workflow_run') &&
-          (fromJson(steps.get-label-action.outputs.result).labelAction == 'add' ||
-           fromJson(steps.get-label-action.outputs.result).labelAction == 'remove')
+          always() &&
+          (github.event_name == 'issue_comment' || github.event_name == 'workflow_run') &&
+          fromJson(steps.get-label-action.outputs.result).issueNumber > 0
         name: Upload artifact with issue number
         uses: ./.github/actions/add-empty-artifact
         with:
diff --git a/.github/workflows/breaking-change-add-label-artifacts.yaml b/.github/workflows/breaking-change-add-label-artifacts.yaml
index 6a19dd711c5c..cd09686c4bcd 100644
--- a/.github/workflows/breaking-change-add-label-artifacts.yaml
+++ b/.github/workflows/breaking-change-add-label-artifacts.yaml
@@ -62,6 +62,13 @@ jobs:
           name: "${{ steps.get-label-actions.outputs.versioningReviewLabelName }}"
           value: "${{ steps.get-label-actions.outputs.versioningReviewLabelValue == 'true' }}"
 
+      - if: ${{ always() && steps.get-label-actions.outputs.head_sha }}
+        name: Upload artifact with head SHA
+        uses: ./.github/actions/add-empty-artifact
+        with:
+          name: head-sha
+          value: ${{ steps.get-label-actions.outputs.head_sha }}
+
       - if: ${{ always() && steps.get-label-actions.outputs.issue_number > 0 }}
         name: Upload artifact with issue number
         uses: ./.github/actions/add-empty-artifact
diff --git a/.github/workflows/sdk-breaking-change-labels.yaml b/.github/workflows/sdk-breaking-change-labels.yaml
index cd8c226aa196..dc0bca7f4ffa 100644
--- a/.github/workflows/sdk-breaking-change-labels.yaml
+++ b/.github/workflows/sdk-breaking-change-labels.yaml
@@ -58,10 +58,14 @@ jobs:
           # Convert "add/remove" to "true/false"
           value: "${{ fromJson(steps.get-label-and-action.outputs.result).labelAction == 'add' }}"
 
-      - if: |
-          ((fromJson(steps.get-label-and-action.outputs.result).labelAction == 'add' ||
-          fromJson(steps.get-label-and-action.outputs.result).labelAction == 'remove') &&
-          fromJson(steps.get-label-and-action.outputs.result).issueNumber > 0)
+      - if: ${{ always() && fromJson(steps.get-label-and-action.outputs.result).headSha }}
+        name: Upload artifact with issue number
+        uses: ./.github/actions/add-empty-artifact
+        with:
+          name: "head-sha"
+          value: "${{ fromJson(steps.get-label-and-action.outputs.result).headSha }}"
+
+      - if: ${{ always() && fromJson(steps.get-label-and-action.outputs.result).issueNumber > 0 }}
         name: Upload artifact with issue number
         uses: ./.github/actions/add-empty-artifact
         with:
diff --git a/.github/workflows/spec-gen-sdk-status.yml b/.github/workflows/spec-gen-sdk-status.yml
index e1bb91ab37ae..faaaf71bbbf7 100644
--- a/.github/workflows/spec-gen-sdk-status.yml
+++ b/.github/workflows/spec-gen-sdk-status.yml
@@ -48,6 +48,13 @@ jobs:
               (await import('${{ github.workspace }}/.github/workflows/src/spec-gen-sdk-status.js')).default;
             return await setStatus({ github, context, core });
 
+      - if: ${{ always() && steps.sdk-validation-status.outputs.head_sha }}
+        name: Upload artifact with head SHA
+        uses: ./.github/actions/add-empty-artifact
+        with:
+          name: head-sha
+          value: ${{ steps.sdk-validation-status.outputs.head_sha }}
+
       - if: ${{ always() && steps.sdk-validation-status.outputs.issue_number }}
         name: Upload artifact with issue number
         uses: ./.github/actions/add-empty-artifact
diff --git a/.github/workflows/src/arm-auto-signoff.js b/.github/workflows/src/arm-auto-signoff.js
index 2d20956f2557..d35d8164fecd 100644
--- a/.github/workflows/src/arm-auto-signoff.js
+++ b/.github/workflows/src/arm-auto-signoff.js
@@ -33,20 +33,23 @@ export default async function getLabelAction({ github, context, core }) {
  * @param {string} params.head_sha
  * @param {(import("@octokit/core").Octokit & import("@octokit/plugin-rest-endpoint-methods/dist-types/types.js").Api & { paginate: import("@octokit/plugin-paginate-rest").PaginateInterface; })} params.github
  * @param {typeof import("@actions/core")} params.core
- * @returns {Promise<{labelAction: LabelAction, issueNumber: number}>}
+ * @returns {Promise<{labelAction: LabelAction, headSha: string, issueNumber: number}>}
  */
 export async function getLabelActionImpl({ owner, repo, issue_number, head_sha, github, core }) {
   const labelActions = {
     [LabelAction.None]: {
       labelAction: LabelAction.None,
+      headSha: head_sha,
       issueNumber: issue_number,
     },
     [LabelAction.Add]: {
       labelAction: LabelAction.Add,
+      headSha: head_sha,
       issueNumber: issue_number,
     },
     [LabelAction.Remove]: {
       labelAction: LabelAction.Remove,
+      headSha: head_sha,
       issueNumber: issue_number,
     },
   };
diff --git a/.github/workflows/src/breaking-change-add-label-artifacts.js b/.github/workflows/src/breaking-change-add-label-artifacts.js
index a66fb1a9693d..639b2bd0131b 100644
--- a/.github/workflows/src/breaking-change-add-label-artifacts.js
+++ b/.github/workflows/src/breaking-change-add-label-artifacts.js
@@ -74,6 +74,7 @@ export default async function getLabelActions({ github, context, core }) {
     })
   ).map((a) => a.name);
 
+  core.setOutput("head_sha", head_sha);
   core.setOutput("issue_number", issue_number);
 
   if (
diff --git a/.github/workflows/src/context.js b/.github/workflows/src/context.js
index 6ef60b4d2993..6a88034ea045 100644
--- a/.github/workflows/src/context.js
+++ b/.github/workflows/src/context.js
@@ -1,5 +1,6 @@
 // @ts-check
 
+import { isFullGitSha } from "../../shared/src/git.js";
 import { PER_PAGE_MAX } from "../../shared/src/github.js";
 import { rateLimitHook } from "./github.js";
 import { getIssueNumber } from "./issues.js";
@@ -98,11 +99,14 @@ export async function extractInputs(github, context, core) {
     );
 
     let issue_number = NaN;
+    let head_sha = "";
 
     if (
       payload.workflow_run.event === "pull_request" ||
       payload.workflow_run.event == "pull_request_target"
     ) {
+      head_sha = payload.workflow_run.head_sha;
+
       // Other properties on payload.workflow_run should be the same for both pull_request and pull_request_target.
 
       // Extract the issue number from the payload itself, or by passing the head_sha to an API.
@@ -126,7 +130,6 @@ export async function extractInputs(github, context, core) {
         // Owner and repo for the PR head (at least one should differ from base for fork PRs)
         const head_owner = payload.workflow_run.head_repository.owner.login;
         const head_repo = payload.workflow_run.head_repository.name;
-        const head_sha = payload.workflow_run.head_sha;
 
         /** @type {PullRequest[]} */
         let pullRequests = [];
@@ -203,19 +206,32 @@ export async function extractInputs(github, context, core) {
       core.info(`artifactNames: ${JSON.stringify(artifactNames)}`);
 
       for (const artifactName of artifactNames) {
-        // If artifactName has format "issue-number=positive-integer", set issue_number=value
-        // Else, if artifactName has format "issue-number=other-string", warn and set issue_number=NaN
-        // - Workflows should probably only set "issue-number" to positive integers, but sometimes set it to "null"
-        // Else, if artifactName does not start with "issue-number=", ignore it
+        // If artifactName has format "head-sha=valid-full-sha", set head_sha=value
+        //   Else, if artifactName has format "head-sha=other-string", warn and set head_sha=""
+        // Else, if artifactName has format "issue-number=positive-integer", set issue_number=value
+        //   Else, if artifactName has format "issue-number=other-string", warn and set issue_number=NaN
+        //   - Workflows should probably only set "issue-number" to positive integers, but sometimes set it to "null"
+        // Else, if artifactName does not start with "head-sha=" or "issue-number=", ignore it
         const firstEquals = artifactName.indexOf("=");
         if (firstEquals !== -1) {
           const key = artifactName.substring(0, firstEquals);
-          if (key === "issue-number") {
+          if (key === "head-sha") {
+            const value = artifactName.substring(firstEquals + 1);
+            if (isFullGitSha(value)) {
+              head_sha = value;
+            } else {
+              // Producers must ensure they only set head-sha to valid full git SHA
+              throw new Error(`head-sha is not a valid full git SHA: '${value}'`);
+            }
+            continue;
+          } else if (key === "issue-number") {
             const value = artifactName.substring(firstEquals + 1);
             const parsedValue = Number.parseInt(value);
             if (parsedValue > 0) {
               issue_number = parsedValue;
             } else {
+              // TODO: Consider throwing instead of warning.  May need to handle `issue-number=null|undefined`,
+              // but invalid integers should throw.
               core.info(`Invalid issue-number: '${value}' parsed to '${parsedValue}'`);
               issue_number = NaN;
             }
@@ -223,6 +239,11 @@ export async function extractInputs(github, context, core) {
           }
         }
       }
+      if (!head_sha) {
+        core.info(
+          `Could not find 'head-sha' artifact, which is required to associate the triggering workflow run with the head SHA of a PR`,
+        );
+      }
       if (!issue_number) {
         core.info(
           `Could not find 'issue-number' artifact, which is required to associate the triggering workflow run with a PR`,
@@ -237,8 +258,8 @@ export async function extractInputs(github, context, core) {
     inputs = {
       owner: payload.workflow_run.repository.owner.login,
       repo: payload.workflow_run.repository.name,
-      head_sha: payload.workflow_run.head_sha,
-      issue_number: issue_number,
+      head_sha,
+      issue_number,
       run_id: payload.workflow_run.id,
     };
   } else if (context.eventName === "check_run") {
diff --git a/.github/workflows/src/set-status.js b/.github/workflows/src/set-status.js
index 30b2f064d255..f30e71368ae1 100644
--- a/.github/workflows/src/set-status.js
+++ b/.github/workflows/src/set-status.js
@@ -1,5 +1,6 @@
 // @ts-check
 
+import { isFullGitSha } from "../../shared/src/git.js";
 import {
   CheckConclusion,
   CheckStatus,
@@ -71,10 +72,14 @@ export async function setStatusImpl({
   requiredStatusName,
   overridingLabel,
 }) {
+  if (!isFullGitSha(head_sha)) {
+    throw new Error(`head_sha is not a valid full git SHA: '${head_sha}'`);
+  }
+  core.setOutput("head_sha", head_sha);
+
   if (!Number.isInteger(issue_number) || issue_number <= 0) {
     throw new Error(`issue_number must be a positive integer: ${issue_number}`);
   }
-
   core.setOutput("issue_number", issue_number);
 
   // TODO: Try to extract labels from context (when available) to avoid unnecessary API call
diff --git a/.github/workflows/src/spec-gen-sdk-status.js b/.github/workflows/src/spec-gen-sdk-status.js
index a4c8770c3089..3a176e57bef9 100644
--- a/.github/workflows/src/spec-gen-sdk-status.js
+++ b/.github/workflows/src/spec-gen-sdk-status.js
@@ -57,6 +57,7 @@ export async function setSpecGenSdkStatusImpl({
   issue_number,
 }) {
   const statusName = "SDK Validation Status";
+  core.setOutput("head_sha", head_sha);
   core.setOutput("issue_number", issue_number);
   const checks = await github.paginate(github.rest.checks.listForRef, {
     owner,
diff --git a/.github/workflows/test/arm-auto-signoff.test.js b/.github/workflows/test/arm-auto-signoff.test.js
index c27801369f36..1ff8a239532c 100644
--- a/.github/workflows/test/arm-auto-signoff.test.js
+++ b/.github/workflows/test/arm-auto-signoff.test.js
@@ -78,7 +78,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.None, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.None, headSha: "abc123", issueNumber: 123 });
   });
 
   it("removes label if not incremental typespec", async () => {
@@ -96,7 +96,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.Remove, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.Remove, headSha: "abc123", issueNumber: 123 });
   });
 
   it("no-ops if incremental typespec in progress", async () => {
@@ -123,7 +123,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.None, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.None, headSha: "abc123", issueNumber: 123 });
   });
 
   it("removes label if no runs of incremental typespec", async () => {
@@ -146,7 +146,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.Remove, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.Remove, headSha: "abc123", issueNumber: 123 });
   });
 
   it("uses latest run of incremental typespec", async () => {
@@ -184,7 +184,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.Remove, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.Remove, headSha: "abc123", issueNumber: 123 });
   });
 
   it.each([
@@ -207,7 +207,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.Remove, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.Remove, headSha: "abc123", issueNumber: 123 });
   });
 
   it.each(["Swagger Avocado", "Swagger LintDiff"])(
@@ -239,7 +239,7 @@ describe("getLabelActionImpl", () => {
           github: github,
           core: core,
         }),
-      ).resolves.toEqual({ labelAction: LabelAction.Remove, issueNumber: 123 });
+      ).resolves.toEqual({ labelAction: LabelAction.Remove, headSha: "abc123", issueNumber: 123 });
     },
   );
 
@@ -299,7 +299,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.None, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.None, headSha: "abc123", issueNumber: 123 });
 
     github.rest.checks.listForRef.mockResolvedValue({
       data: {
@@ -321,7 +321,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.None, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.None, headSha: "abc123", issueNumber: 123 });
   });
 
   it("adds label if incremental tsp, labels match, and check succeeded", async () => {
@@ -356,6 +356,6 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).resolves.toEqual({ labelAction: LabelAction.Add, issueNumber: 123 });
+    ).resolves.toEqual({ labelAction: LabelAction.Add, headSha: "abc123", issueNumber: 123 });
   });
 });
diff --git a/.github/workflows/test/breaking-change-add-label-artifacts.test.js b/.github/workflows/test/breaking-change-add-label-artifacts.test.js
index 2055f3915fdc..b46d486f88f6 100644
--- a/.github/workflows/test/breaking-change-add-label-artifacts.test.js
+++ b/.github/workflows/test/breaking-change-add-label-artifacts.test.js
@@ -74,6 +74,7 @@ describe("breaking-change-add-label-artifacts", () => {
   ];
 
   const expectStandardOutputs = (breakingChangeValue, versioningValue) => {
+    expect(mockCore.setOutput).toHaveBeenCalledWith("head_sha", mockInputs.head_sha);
     expect(mockCore.setOutput).toHaveBeenCalledWith("issue_number", mockInputs.issue_number);
     expect(mockCore.setOutput).toHaveBeenCalledWith(
       "breakingChangeReviewLabelName",
diff --git a/.github/workflows/test/context.test.js b/.github/workflows/test/context.test.js
index f76bcd6c17ec..0dd2ec11a3a2 100644
--- a/.github/workflows/test/context.test.js
+++ b/.github/workflows/test/context.test.js
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { PER_PAGE_MAX } from "../../shared/src/github.js";
+import { fullGitSha } from "../../shared/test/examples.js";
 import { extractInputs } from "../src/context.js";
 import { createMockCore, createMockGithub } from "./mocks.js";
 
@@ -275,6 +276,32 @@ describe("extractInputs", () => {
         });
 
         expect(github.rest.search.issuesAndPullRequests).toHaveBeenCalled();
+
+        // Simulate REST API throwing error, which should be handled, log a warning, and then
+        // treat like any other scenario with no pull requests.
+        github.rest.repos.listPullRequestsAssociatedWithCommit.mockRejectedValue(
+          new Error("test-error"),
+        );
+
+        await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
+          owner: "TestRepoOwnerLogin",
+          repo: "TestRepoName",
+          head_sha: "abc123",
+          issue_number: 789,
+          run_id: 456,
+        });
+
+        // Simulate REST API throwing object, which should be handled, log a warning, and then
+        // treat like any other scenario with no pull requests.
+        github.rest.repos.listPullRequestsAssociatedWithCommit.mockRejectedValue("test-error");
+
+        await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
+          owner: "TestRepoOwnerLogin",
+          repo: "TestRepoName",
+          head_sha: "abc123",
+          issue_number: 789,
+          run_id: 456,
+        });
       } else if (numPullRequests === 1 || numPullRequests === 2) {
         // Second PR is to a different repo, so expect same behavior with or without it
         await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
@@ -307,7 +334,7 @@ describe("extractInputs", () => {
   it("workflow_run:completed:workflow_run", async () => {
     const github = createMockGithub();
     github.rest.actions.listWorkflowRunArtifacts.mockResolvedValue({
-      data: { artifacts: [{ name: "issue-number=123" }] },
+      data: { artifacts: [{ name: "issue-number=123" }, { name: `head-sha=${fullGitSha}` }] },
     });
 
     const context = {
@@ -316,7 +343,7 @@ describe("extractInputs", () => {
         action: "completed",
         workflow_run: {
           event: "workflow_run",
-          head_sha: "abc123",
+          head_sha: "def456",
           id: 456,
           repository: {
             name: "TestRepoName",
@@ -331,18 +358,27 @@ describe("extractInputs", () => {
     await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
       owner: "TestRepoOwnerLogin",
       repo: "TestRepoName",
-      head_sha: "abc123",
+      head_sha: fullGitSha,
       issue_number: 123,
       run_id: 456,
     });
 
+    github.rest.actions.listWorkflowRunArtifacts.mockResolvedValue({
+      data: { artifacts: [{ name: "head-sha=not-full-git-sha" }] },
+    });
+    await expect(
+      extractInputs(github, context, createMockCore()),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: head-sha is not a valid full git SHA: 'not-full-git-sha']`,
+    );
+
     github.rest.actions.listWorkflowRunArtifacts.mockResolvedValue({
       data: { artifacts: [{ name: "issue-number=not-a-number" }] },
     });
     await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
       owner: "TestRepoOwnerLogin",
       repo: "TestRepoName",
-      head_sha: "abc123",
+      head_sha: "",
       issue_number: NaN,
       run_id: 456,
     });
@@ -353,7 +389,7 @@ describe("extractInputs", () => {
     await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
       owner: "TestRepoOwnerLogin",
       repo: "TestRepoName",
-      head_sha: "abc123",
+      head_sha: "",
       issue_number: NaN,
       run_id: 456,
     });
@@ -364,7 +400,7 @@ describe("extractInputs", () => {
     await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
       owner: "TestRepoOwnerLogin",
       repo: "TestRepoName",
-      head_sha: "abc123",
+      head_sha: "",
       issue_number: NaN,
       run_id: 456,
     });
@@ -387,7 +423,7 @@ describe("extractInputs", () => {
   it("workflow_run:completed:check_run", async () => {
     const github = createMockGithub();
     github.rest.actions.listWorkflowRunArtifacts.mockResolvedValue({
-      data: { artifacts: [] },
+      data: { artifacts: [{ name: `head-sha=${fullGitSha}` }] },
     });
 
     const context = {
@@ -396,7 +432,7 @@ describe("extractInputs", () => {
         action: "completed",
         workflow_run: {
           event: "check_run",
-          head_sha: "abc123",
+          head_sha: "def456",
           id: 456,
           repository: {
             name: "TestRepoName",
@@ -408,13 +444,10 @@ describe("extractInputs", () => {
       },
     };
 
-    github.rest.actions.listWorkflowRunArtifacts.mockResolvedValue({
-      data: { artifacts: [] },
-    });
     await expect(extractInputs(github, context, createMockCore())).resolves.toEqual({
       owner: "TestRepoOwnerLogin",
       repo: "TestRepoName",
-      head_sha: "abc123",
+      head_sha: fullGitSha,
       issue_number: NaN,
       run_id: 456,
     });
diff --git a/.github/workflows/test/set-status.test.js b/.github/workflows/test/set-status.test.js
index a14ed5898db0..26d506caa4fa 100644
--- a/.github/workflows/test/set-status.test.js
+++ b/.github/workflows/test/set-status.test.js
@@ -1,9 +1,9 @@
 // @ts-check
 
 import { beforeEach, describe, expect, it } from "vitest";
-import { setStatusImpl } from "../src/set-status.js";
-
 import { CheckConclusion, CheckStatus, CommitStatusState } from "../../shared/src/github.js";
+import { fullGitSha } from "../../shared/test/examples.js";
+import { setStatusImpl } from "../src/set-status.js";
 import { createMockCore, createMockGithub } from "./mocks.js";
 
 describe("setStatusImpl", () => {
@@ -16,17 +16,20 @@ describe("setStatusImpl", () => {
   });
 
   it("throws if inputs null", async () => {
-    await expect(setStatusImpl({})).rejects.toThrow();
+    // @ts-expect-error Testing invalid input type
+    await expect(setStatusImpl({})).rejects.toMatchInlineSnapshot(
+      `[Error: head_sha is not a valid full git SHA: 'undefined']`,
+    );
   });
 
-  it("throws when issue_number is null", async () => {
+  it.each([null, undefined, "", "abc123"])("throws when head_sha is %o", async (head_sha) => {
     await expect(
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
         // @ts-expect-error - Testing invalid input
-        issue_number: null,
+        head_sha,
+        issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
         core,
@@ -34,68 +37,17 @@ describe("setStatusImpl", () => {
         requiredStatusName: "test-status",
         overridingLabel: "test-label",
       }),
-    ).rejects.toThrow("issue_number must be a positive integer");
+    ).rejects.toThrow("head_sha is not a valid full git SHA");
   });
 
-  it("throws when issue_number is undefined", async () => {
+  it.each([null, undefined, NaN, 0, -1])("throws when issue_number is %o", async (issue_number) => {
     await expect(
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         // @ts-expect-error - Testing invalid input
-        issue_number: undefined,
-        target_url: "https://test.com/set_status_url",
-        github,
-        core,
-        monitoredWorkflowName: "test-workflow",
-        requiredStatusName: "test-status",
-        overridingLabel: "test-label",
-      }),
-    ).rejects.toThrow("issue_number must be a positive integer");
-  });
-
-  it("throws when issue_number is NaN", async () => {
-    await expect(
-      setStatusImpl({
-        owner: "test-owner",
-        repo: "test-repo",
-        head_sha: "test-head-sha",
-        issue_number: NaN,
-        target_url: "https://test.com/set_status_url",
-        github,
-        core,
-        monitoredWorkflowName: "test-workflow",
-        requiredStatusName: "test-status",
-        overridingLabel: "test-label",
-      }),
-    ).rejects.toThrow("issue_number must be a positive integer");
-  });
-
-  it("throws when issue_number is zero", async () => {
-    await expect(
-      setStatusImpl({
-        owner: "test-owner",
-        repo: "test-repo",
-        head_sha: "test-head-sha",
-        issue_number: 0,
-        target_url: "https://test.com/set_status_url",
-        github,
-        core,
-        monitoredWorkflowName: "test-workflow",
-        requiredStatusName: "test-status",
-        overridingLabel: "test-label",
-      }),
-    ).rejects.toThrow("issue_number must be a positive integer");
-  });
-
-  it("throws when issue_number is negative", async () => {
-    await expect(
-      setStatusImpl({
-        owner: "test-owner",
-        repo: "test-repo",
-        head_sha: "test-head-sha",
-        issue_number: -1,
+        issue_number,
         target_url: "https://test.com/set_status_url",
         github,
         core,
@@ -115,7 +67,7 @@ describe("setStatusImpl", () => {
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
@@ -129,7 +81,7 @@ describe("setStatusImpl", () => {
     expect(github.rest.repos.createCommitStatus).toBeCalledWith({
       owner: "test-owner",
       repo: "test-repo",
-      sha: "test-head-sha",
+      sha: fullGitSha,
       state: CommitStatusState.SUCCESS,
       context: "[TEST-IGNORE] Swagger Avocado",
       description: "Found label 'Approved-Avocado'",
@@ -146,7 +98,7 @@ describe("setStatusImpl", () => {
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
@@ -161,12 +113,15 @@ describe("setStatusImpl", () => {
     expect(github.rest.repos.createCommitStatus).toBeCalledWith({
       owner: "test-owner",
       repo: "test-repo",
-      sha: "test-head-sha",
+      sha: fullGitSha,
       state: CommitStatusState.SUCCESS,
       context: "[TEST-IGNORE] Swagger BreakingChange",
       description: "Found label 'BreakingChange-Approved-Benign'",
       target_url: "https://test.com/set_status_url",
     });
+
+    expect(core.setOutput).toBeCalledWith("head_sha", fullGitSha);
+    expect(core.setOutput).toBeCalledWith("issue_number", 123);
   });
 
   it("handles comma-separated labels with whitespace", async () => {
@@ -178,7 +133,7 @@ describe("setStatusImpl", () => {
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
@@ -193,7 +148,7 @@ describe("setStatusImpl", () => {
     expect(github.rest.repos.createCommitStatus).toBeCalledWith({
       owner: "test-owner",
       repo: "test-repo",
-      sha: "test-head-sha",
+      sha: fullGitSha,
       state: CommitStatusState.SUCCESS,
       context: "[TEST-IGNORE] Swagger BreakingChange",
       description: "Found label 'BreakingChange-Approved-UserImpact'",
@@ -210,7 +165,7 @@ describe("setStatusImpl", () => {
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
@@ -224,7 +179,7 @@ describe("setStatusImpl", () => {
     expect(github.rest.repos.createCommitStatus).toBeCalledWith({
       owner: "test-owner",
       repo: "test-repo",
-      sha: "test-head-sha",
+      sha: fullGitSha,
       state: CommitStatusState.SUCCESS,
       context: "[TEST-IGNORE] Swagger BreakingChange",
       description: "Found label 'BreakingChange-Approved-Security'",
@@ -245,7 +200,7 @@ describe("setStatusImpl", () => {
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
@@ -260,7 +215,7 @@ describe("setStatusImpl", () => {
     expect(github.rest.repos.createCommitStatus).toBeCalledWith({
       owner: "test-owner",
       repo: "test-repo",
-      sha: "test-head-sha",
+      sha: fullGitSha,
       state: CommitStatusState.PENDING,
       context: "[TEST-IGNORE] Swagger BreakingChange",
       target_url: "https://test.com/set_status_url",
@@ -280,7 +235,7 @@ describe("setStatusImpl", () => {
       setStatusImpl({
         owner: "test-owner",
         repo: "test-repo",
-        head_sha: "test-head-sha",
+        head_sha: fullGitSha,
         issue_number: 123,
         target_url: "https://test.com/set_status_url",
         github,
@@ -294,7 +249,7 @@ describe("setStatusImpl", () => {
     expect(github.rest.repos.createCommitStatus).toBeCalledWith({
       owner: "test-owner",
       repo: "test-repo",
-      sha: "test-head-sha",
+      sha: fullGitSha,
       state: CommitStatusState.PENDING,
       context: "[TEST-IGNORE] Swagger BreakingChange",
       target_url: "https://test.com/set_status_url",
@@ -373,7 +328,7 @@ describe("setStatusImpl", () => {
         setStatusImpl({
           owner: "test-owner",
           repo: "test-repo",
-          head_sha: "test-head-sha",
+          head_sha: fullGitSha,
           issue_number: 123,
           target_url: "https://test.com/set_status_url",
           github,
@@ -387,7 +342,7 @@ describe("setStatusImpl", () => {
       expect(github.rest.repos.createCommitStatus).toBeCalledWith({
         owner: "test-owner",
         repo: "test-repo",
-        sha: "test-head-sha",
+        sha: fullGitSha,
         state: commitStatusState,
         context: "[TEST-IGNORE] Swagger Avocado",
         target_url: targetUrl,
diff --git a/.github/workflows/test/spec-gen-sdk-status.test.js b/.github/workflows/test/spec-gen-sdk-status.test.js
index 6ac0ad303da9..edb3f10be70e 100644
--- a/.github/workflows/test/spec-gen-sdk-status.test.js
+++ b/.github/workflows/test/spec-gen-sdk-status.test.js
@@ -79,6 +79,7 @@ describe("spec-gen-sdk-status", () => {
       target_url: "https://example.com",
       github: mockGithub,
       core: mockCore,
+      issue_number: 123,
     });
 
     // Verify the right status was set
@@ -90,6 +91,9 @@ describe("spec-gen-sdk-status", () => {
         state: "pending",
       }),
     );
+
+    expect(mockCore.setOutput).toBeCalledWith("head_sha", "testSha");
+    expect(mockCore.setOutput).toBeCalledWith("issue_number", 123);
   });
 
   it("should set success status when all checks are completed successfully", async () => {
diff --git a/eng/tools/spec-gen-sdk-runner/src/command-helpers.ts b/eng/tools/spec-gen-sdk-runner/src/command-helpers.ts
index 0cb2a9c53bf9..fc42f69a1b4b 100644
--- a/eng/tools/spec-gen-sdk-runner/src/command-helpers.ts
+++ b/eng/tools/spec-gen-sdk-runner/src/command-helpers.ts
@@ -320,6 +320,7 @@ export function generateArtifact(
     const artifactInfo: SpecGenSdkArtifactInfo = {
       language: commandInput.sdkLanguage,
       result,
+      headSha: commandInput.specCommitSha,
       prNumber: commandInput.prNumber,
       labelAction: hasBreakingChange,
       isSpecGenSdkCheckRequired,
diff --git a/eng/tools/spec-gen-sdk-runner/src/types.ts b/eng/tools/spec-gen-sdk-runner/src/types.ts
index e50d63947b77..7cdbee04afa6 100644
--- a/eng/tools/spec-gen-sdk-runner/src/types.ts
+++ b/eng/tools/spec-gen-sdk-runner/src/types.ts
@@ -44,6 +44,7 @@ export type VsoLogs = Map<
 export interface SpecGenSdkArtifactInfo {
   language: string;
   result: string;
+  headSha: string;
   prNumber?: string;
   labelAction?: boolean;
   isSpecGenSdkCheckRequired: boolean;
diff --git a/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts b/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts
index 9fefa8d61f25..be8adf2a1321 100644
--- a/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts
+++ b/eng/tools/spec-gen-sdk-runner/test/command-helpers.test.ts
@@ -421,8 +421,9 @@ describe("commands.ts", () => {
         runMode: "",
         localSpecRepoPath: "",
         localSdkRepoPath: "",
+        prNumber: "123",
         sdkRepoName: "",
-        specCommitSha: "",
+        specCommitSha: "abc123",
         specRepoHttpsUrl: "",
       };
       const mockResult = "succeeded";
@@ -457,6 +458,8 @@ describe("commands.ts", () => {
           {
             language: "azure-sdk-for-js",
             result: "succeeded",
+            headSha: "abc123",
+            prNumber: "123",
             labelAction: false,
             isSpecGenSdkCheckRequired: false,
             apiViewRequestData: [],
@@ -586,6 +589,7 @@ describe("commands.ts", () => {
           {
             language: "azure-sdk-for-go",
             result: "succeeded",
+            headSha: "",
             labelAction: false,
             isSpecGenSdkCheckRequired: false, // This should be false when sdkGenerationExecuted is false
             apiViewRequestData: [],

From a07a5c23580dd9f18d35a679385cec84a41a1cbd Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@microsoft.com>
Date: Wed, 6 Aug 2025 16:11:10 -0700
Subject: [PATCH 23/34] Added more information to SDK PR description and
 updatedthe PR creation parameter (#36502)

* Added more info to output and print the sdk repo git diff

* Updated createPullRequest parameter

* remove diff print step

* upgrade spec-gen-sdk
---
 eng/pipelines/spec-gen-sdk.yml                           | 8 ++++----
 .../templates/stages/archetype-spec-gen-sdk.yml          | 9 +++++++--
 package-lock.json                                        | 8 ++++----
 package.json                                             | 2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/eng/pipelines/spec-gen-sdk.yml b/eng/pipelines/spec-gen-sdk.yml
index 0b5b5e849d6e..d324b28067ea 100644
--- a/eng/pipelines/spec-gen-sdk.yml
+++ b/eng/pipelines/spec-gen-sdk.yml
@@ -25,11 +25,11 @@ parameters:
       - 'stable'
     default: 'beta'
     displayName: 'SDK release type'
-  - name: SkipPullRequestCreation
+  - name: CreatePullRequest
     type: boolean
     default: false
-    displayName: 'Skip SDK pull request creation'
-    
+    displayName: 'Create SDK pull request'
+
 trigger: none
 
 extends:
@@ -42,4 +42,4 @@ extends:
     ConfigPath: ${{ parameters.ConfigPath }}
     ApiVersion: ${{ parameters.ApiVersion }}
     SdkReleaseType: ${{ parameters.SdkReleaseType }}
-    SkipPullRequestCreation: ${{ parameters.SkipPullRequestCreation }}
+    CreatePullRequest: ${{ parameters.CreatePullRequest }}
diff --git a/eng/pipelines/templates/stages/archetype-spec-gen-sdk.yml b/eng/pipelines/templates/stages/archetype-spec-gen-sdk.yml
index 764f9e421e0b..9fd98f9ed3da 100644
--- a/eng/pipelines/templates/stages/archetype-spec-gen-sdk.yml
+++ b/eng/pipelines/templates/stages/archetype-spec-gen-sdk.yml
@@ -22,7 +22,7 @@ parameters:
     type: string
     default: ''
     displayName: 'SDK release type'
-  - name: SkipPullRequestCreation
+  - name: CreatePullRequest
     type: boolean
     default: false
   - name: SpecBatchTypes
@@ -171,6 +171,11 @@ stages:
             sdk_gen_info="$sdk_gen_info API Version: ${{ parameters.ApiVersion }}, SDK Release Type: ${{ parameters.SdkReleaseType }},"
           fi
           sdk_gen_info="$sdk_gen_info and CommitSHA: '$updatedSpecRepoCommit' in SpecRepo: '${{ parameters.SpecRepoUrl }}'"
+
+          if [ "$(Build.Reason)" = "Manual" ]; then
+            sdk_gen_info="$sdk_gen_info Pipeline run: $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)"
+            sdk_gen_info="$sdk_gen_info Refer to https://eng.ms/docs/products/azure-developer-experience/develop/sdk-release/sdk-release-prerequisites to prepare for SDK release."
+          fi
           echo "##vso[task.setvariable variable=GeneratedSDKInformation]$sdk_gen_info"
           echo "$sdk_gen_info"
 
@@ -200,7 +205,7 @@ stages:
           ArtifactPath: $(StagedArtifactsFolder)
           CustomCondition: and(succeededOrFailed(), ne(variables['StagedArtifactsFolder'], ''))
 
-      - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.SkipPullRequestCreation, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
+      - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.CreatePullRequest, true), ne(variables['Build.Reason'], 'PullRequest')) }}:
         - template: /eng/common/pipelines/templates/steps/git-push-changes.yml
           parameters:
             BaseRepoBranch: $(PrBranch)-$(Build.BuildId)
diff --git a/package-lock.json b/package-lock.json
index 565f31b54a74..1743baa18069 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
       "name": "azure-rest-api-specs",
       "devDependencies": {
         "@autorest/openapi-to-typespec": "0.11.5",
-        "@azure-tools/spec-gen-sdk": "~0.9.0",
+        "@azure-tools/spec-gen-sdk": "~0.9.1",
         "@azure-tools/specs-shared": "file:.github/shared",
         "@azure-tools/typespec-apiview": "0.7.2",
         "@azure-tools/typespec-autorest": "0.58.1",
@@ -1008,9 +1008,9 @@
       "link": true
     },
     "node_modules/@azure-tools/spec-gen-sdk": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@azure-tools/spec-gen-sdk/-/spec-gen-sdk-0.9.0.tgz",
-      "integrity": "sha512-Xjtkxq5EK/di2mTtPGoiSXuhHVhKpu5jNp1Fbx8VbBBuM+tV9BqN+nOe88VRzo5YAvCZArjstoFWu2TVTTm4rQ==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/@azure-tools/spec-gen-sdk/-/spec-gen-sdk-0.9.1.tgz",
+      "integrity": "sha512-H6hDGHtbHWl/dldB+y5wrYtx965kYNleDEWFjWvMIS29yYwDCljlo9AAadLCmlXvi46ksXh2nePYxBjeTafv9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 863142289f85..10748cfb9e49 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
-    "@azure-tools/spec-gen-sdk": "~0.9.0",
+    "@azure-tools/spec-gen-sdk": "~0.9.1",
     "@azure-tools/specs-shared": "file:.github/shared",
     "@azure-tools/typespec-apiview": "0.7.2",
     "@azure-tools/typespec-autorest": "0.58.1",

From 3bfc547007ade87a27835dfa36fb4c4f5e91e1d7 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 6 Aug 2025 16:14:27 -0700
Subject: [PATCH 24/34] [BreakingChanges] Delete "watch" workflows (used for
 migration) (#36504)

---
 .../watch-breakingchange-crossversion.yaml    | 27 -------------------
 .github/workflows/watch-breakingchange.yaml   | 27 -------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 .github/workflows/watch-breakingchange-crossversion.yaml
 delete mode 100644 .github/workflows/watch-breakingchange.yaml

diff --git a/.github/workflows/watch-breakingchange-crossversion.yaml b/.github/workflows/watch-breakingchange-crossversion.yaml
deleted file mode 100644
index 41fa9752c676..000000000000
--- a/.github/workflows/watch-breakingchange-crossversion.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Use ~ to sort the workflow to the bottom of the list
-name: "~Watch - Breaking Change(Cross-Version)"
-
-on:
-  # check_suite is preferred over check_run to avoid triggering on all check
-  # runs. In some cases, check_run must be used in testing environments.
-  check_suite:
-    types: completed
-
-  workflow_run:
-    types: completed
-    workflows:
-      - "\\[TEST-IGNORE\\] Breaking Change(Cross-Version) - Set Status"
-
-permissions:
-  actions: read
-  checks: read
-  contents: read
-  statuses: read
-
-jobs:
-  BreakingChangeCrossVersion:
-    name: Watch Breaking Change(Cross-Version)
-    uses: ./.github/workflows/_reusable-verify-run-status.yaml
-    with:
-      check_run_name: "Breaking Change(Cross-Version)"
-      commit_status_name: "[TEST-IGNORE] Breaking Change(Cross-Version)"
diff --git a/.github/workflows/watch-breakingchange.yaml b/.github/workflows/watch-breakingchange.yaml
deleted file mode 100644
index 50978f8a475b..000000000000
--- a/.github/workflows/watch-breakingchange.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Use ~ to sort the workflow to the bottom of the list
-name: "~Watch - BreakingChange"
-
-on:
-  # check_suite is preferred over check_run to avoid triggering on all check
-  # runs. In some cases, check_run must be used in testing environments.
-  check_suite:
-    types: completed
-
-  workflow_run:
-    types: completed
-    workflows:
-      - "\\[TEST-IGNORE\\] Swagger BreakingChange - Set Status"
-
-permissions:
-  actions: read
-  checks: read
-  contents: read
-  statuses: read
-
-jobs:
-  BreakingChange:
-    name: Watch BreakingChange
-    uses: ./.github/workflows/_reusable-verify-run-status.yaml
-    with:
-      check_run_name: "Swagger BreakingChange"
-      commit_status_name: "[TEST-IGNORE] Swagger BreakingChange"

From 98c8aa161cd3ed819be07cd07cbf1f7d90471692 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 6 Aug 2025 17:39:44 -0700
Subject: [PATCH 25/34] [ARM Auto Signoff] Use statuses for LintDiff and
 Avocado (#36472)

---
 .github/workflows/arm-auto-signoff.yaml       |  18 +--
 .github/workflows/src/arm-auto-signoff.js     |  66 ++++++----
 .../workflows/test/arm-auto-signoff.test.js   | 123 ++++++++++--------
 .github/workflows/test/mocks.js               |   1 +
 4 files changed, 112 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/arm-auto-signoff.yaml b/.github/workflows/arm-auto-signoff.yaml
index d7eea4313dce..75cd6f1edfcd 100644
--- a/.github/workflows/arm-auto-signoff.yaml
+++ b/.github/workflows/arm-auto-signoff.yaml
@@ -1,20 +1,18 @@
 name: ARM Auto SignOff
 
 on:
-  issue_comment:
-    types:
-      - edited
   # Must run on pull_request_target instead of pull_request, since the latter cannot trigger on
   # labels from bot accounts in fork PRs. pull_request_target is also more similar to the other
-  # triggers "issue_comment" and "workflow_run" -- they are all privileged# and run in the target
-  # branch and repo -- which simplifies implementation.
+  # trigger "workflow_run" -- they are both privileged and run in the target branch and repo --
+  # which simplifies implementation.
   pull_request_target:
     types:
       # Depends on labels, so must re-evaluate whenever a relevant label is manually added or removed.
       - labeled
       - unlabeled
   workflow_run:
-    workflows: ["ARM Incremental TypeSpec"]
+    workflows:
+      ["ARM Incremental TypeSpec", "Swagger Avocado - Set Status", "Swagger LintDiff - Set Status"]
     types: [completed]
 
 permissions:
@@ -28,9 +26,8 @@ jobs:
   arm-auto-signoff:
     name: ARM Auto SignOff
 
+    # workflow_run - already filtered by triggers above
     # pull_request_target:labeled - filter to only the input and output labels
-    # issue_comment:edited - filter to only PR comments containing "next steps to merge",
-    #   a signal that checks like "Swagger LintDiff" or "Swagger Avocado" status may have changed
     if: |
       github.event_name == 'workflow_run' ||
       (github.event_name == 'pull_request_target' &&
@@ -41,10 +38,7 @@ jobs:
         github.event.label.name == 'ARMReview' ||
         github.event.label.name == 'ARMSignedOff' ||
         github.event.label.name == 'NotReadyForARMReview' ||
-        github.event.label.name == 'SuppressionReviewRequired')) ||
-      (github.event_name == 'issue_comment' &&
-       github.event.issue.pull_request &&
-       contains(github.event.comment.body, 'next steps to merge'))
+        github.event.label.name == 'SuppressionReviewRequired'))
 
     runs-on: ubuntu-24.04
 
diff --git a/.github/workflows/src/arm-auto-signoff.js b/.github/workflows/src/arm-auto-signoff.js
index d35d8164fecd..6c6ac7d9b1ff 100644
--- a/.github/workflows/src/arm-auto-signoff.js
+++ b/.github/workflows/src/arm-auto-signoff.js
@@ -1,7 +1,8 @@
 // @ts-check
 
 import { setEquals } from "../../shared/src/equality.js";
-import { PER_PAGE_MAX } from "../../shared/src/github.js";
+import { CommitStatusState, PER_PAGE_MAX } from "../../shared/src/github.js";
+import { byDate, invert } from "../../shared/src/sort.js";
 import { extractInputs } from "./context.js";
 import { LabelAction } from "./label.js";
 
@@ -142,52 +143,63 @@ export async function getLabelActionImpl({ owner, repo, issue_number, head_sha,
     return removeAction;
   }
 
-  const checkRuns = await github.paginate(github.rest.checks.listForRef, {
+  const statuses = await github.paginate(github.rest.repos.listCommitStatusesForRef, {
     owner: owner,
     repo: repo,
     ref: head_sha,
     per_page: PER_PAGE_MAX,
   });
 
-  const requiredCheckNames = ["Swagger LintDiff", "Swagger Avocado"];
+  core.info("Statuses:");
+  statuses.forEach((status) => {
+    core.info(`- ${status.context}: ${status.state}`);
+  });
+
+  const requiredStatusNames = ["Swagger LintDiff", "Swagger Avocado"];
 
   /**
-   * @type {typeof checkRuns.check_runs}
+   * @type {typeof statuses}
    */
-  let requiredCheckRuns = [];
-
-  for (const checkName of requiredCheckNames) {
-    const matchingRuns = checkRuns.filter((run) => run.name === checkName);
-
-    if (matchingRuns.length > 1) {
-      throw new Error(`Unexpected number of checks named '${checkName}': ${matchingRuns.length}`);
-    }
-
-    const matchingRun = matchingRuns.length === 1 ? matchingRuns[0] : undefined;
-
-    core.info(
-      `${checkName}: Status='${matchingRun?.status}', Conclusion='${matchingRun?.conclusion}'`,
-    );
-
-    if (matchingRun && matchingRun.status === "completed" && matchingRun.conclusion !== "success") {
-      core.info(`Check '${checkName}' did not succeed`);
+  let requiredStatuses = [];
+
+  for (const statusName of requiredStatusNames) {
+    // The "statuses" array may contain multiple statuses with the same "context" (aka "name"),
+    // but different states and update times.  We only care about the latest.
+    const matchingStatuses = statuses
+      .filter((status) => status.context.toLowerCase() === statusName.toLowerCase())
+      .sort(invert(byDate((status) => status.updated_at)));
+
+    // undefined if matchingStatuses.length === 0 (which is OK)
+    const matchingStatus = matchingStatuses[0];
+
+    core.info(`${statusName}: State='${matchingStatus?.state}'`);
+
+    if (
+      matchingStatus &&
+      (matchingStatus.state === CommitStatusState.ERROR ||
+        matchingStatus.state === CommitStatusState.FAILURE)
+    ) {
+      core.info(`Status '${matchingStatus}' did not succeed`);
       return removeAction;
     }
 
-    if (matchingRun) {
-      requiredCheckRuns.push(matchingRun);
+    if (matchingStatus) {
+      requiredStatuses.push(matchingStatus);
     }
   }
 
   if (
-    setEquals(new Set(requiredCheckRuns.map((run) => run.name)), new Set(requiredCheckNames)) &&
-    requiredCheckRuns.every((run) => run.status === "completed" && run.conclusion === "success")
+    setEquals(
+      new Set(requiredStatuses.map((status) => status.context)),
+      new Set(requiredStatusNames),
+    ) &&
+    requiredStatuses.every((status) => status.state === CommitStatusState.SUCCESS)
   ) {
     core.info("All requirements met for auto-signoff");
     return labelActions[LabelAction.Add];
   }
 
-  // If any checks are missing or not completed, no-op to prevent frequent remove/add label as checks re-run
-  core.info("One or more checks are still in-progress");
+  // If any statuses are missing or pending, no-op to prevent frequent remove/add label as checks re-run
+  core.info("One or more statuses are still pending");
   return labelActions[LabelAction.None];
 }
diff --git a/.github/workflows/test/arm-auto-signoff.test.js b/.github/workflows/test/arm-auto-signoff.test.js
index 1ff8a239532c..d354f08b54bf 100644
--- a/.github/workflows/test/arm-auto-signoff.test.js
+++ b/.github/workflows/test/arm-auto-signoff.test.js
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import { CommitStatusState } from "../../shared/src/github.js";
 import { getLabelActionImpl } from "../src/arm-auto-signoff.js";
 import { LabelAction } from "../src/label.js";
 import { createMockCore, createMockGithub as createMockGithubBase } from "./mocks.js";
@@ -218,16 +219,13 @@ describe("getLabelActionImpl", () => {
       github.rest.issues.listLabelsOnIssue.mockResolvedValue({
         data: [{ name: "ARMAutoSignedOff" }, { name: "ARMReview" }],
       });
-      github.rest.checks.listForRef.mockResolvedValue({
-        data: {
-          check_runs: [
-            {
-              name: check,
-              status: "completed",
-              conclusion: "failure",
-            },
-          ],
-        },
+      github.rest.repos.listCommitStatusesForRef.mockResolvedValue({
+        data: [
+          {
+            context: check,
+            state: CommitStatusState.FAILURE,
+          },
+        ],
       });
 
       await expect(
@@ -243,29 +241,54 @@ describe("getLabelActionImpl", () => {
     },
   );
 
-  it("thows if multiple runs for same check", async () => {
+  it.each([
+    [CommitStatusState.ERROR, ["ARMReview", "ARMAutoSignedOff"]],
+    [CommitStatusState.FAILURE, ["ARMReview", "ARMAutoSignedOff"]],
+    [CommitStatusState.PENDING, ["ARMReview"]],
+    [CommitStatusState.SUCCESS, ["ARMReview"]],
+  ])("uses latest status if multiple (%o)", async (state, labels) => {
     const github = createMockGithub({ incrementalTypeSpec: true });
 
     github.rest.issues.listLabelsOnIssue.mockResolvedValue({
-      data: [{ name: "ARMReview" }],
+      data: labels.map((l) => ({
+        name: l,
+      })),
     });
 
-    github.rest.checks.listForRef.mockResolvedValue({
-      data: {
-        check_runs: [
-          {
-            name: "Swagger LintDiff",
-            status: "in_progress",
-            conclusion: null,
-          },
-          {
-            name: "Swagger LintDiff",
-            status: "in_progress",
-            conclusion: null,
-          },
-        ],
-      },
+    github.rest.repos.listCommitStatusesForRef.mockResolvedValue({
+      data: [
+        {
+          context: "Swagger Avocado",
+          state: CommitStatusState.SUCCESS,
+          updated_at: "2025-01-01",
+        },
+        {
+          context: "Swagger LintDiff",
+          state: CommitStatusState.PENDING,
+          updated_at: "2025-01-01",
+        },
+        {
+          context: "Swagger LintDiff",
+          state,
+          updated_at: "2025-01-02",
+        },
+      ],
     });
+
+    let expectedAction;
+    switch (state) {
+      case CommitStatusState.ERROR:
+      case CommitStatusState.FAILURE:
+        expectedAction = LabelAction.Remove;
+        break;
+      case CommitStatusState.SUCCESS:
+        expectedAction = LabelAction.Add;
+        break;
+      case CommitStatusState.PENDING:
+        expectedAction = LabelAction.None;
+        break;
+    }
+
     await expect(
       getLabelActionImpl({
         owner: "TestOwner",
@@ -275,7 +298,7 @@ describe("getLabelActionImpl", () => {
         github: github,
         core: core,
       }),
-    ).rejects.toThrow();
+    ).resolves.toEqual({ labelAction: expectedAction, headSha: "abc123", issueNumber: 123 });
   });
 
   it("no-ops if check not found or not completed", async () => {
@@ -285,10 +308,8 @@ describe("getLabelActionImpl", () => {
       data: [{ name: "ARMReview" }],
     });
 
-    github.rest.checks.listForRef.mockResolvedValue({
-      data: {
-        check_runs: [],
-      },
+    github.rest.repos.listCommitStatusesForRef.mockResolvedValue({
+      data: [],
     });
     await expect(
       getLabelActionImpl({
@@ -301,16 +322,8 @@ describe("getLabelActionImpl", () => {
       }),
     ).resolves.toEqual({ labelAction: LabelAction.None, headSha: "abc123", issueNumber: 123 });
 
-    github.rest.checks.listForRef.mockResolvedValue({
-      data: {
-        check_runs: [
-          {
-            name: "Swagger LintDiff",
-            status: "in_progress",
-            conclusion: null,
-          },
-        ],
-      },
+    github.rest.repos.listCommitStatusesForRef.mockResolvedValue({
+      data: [{ context: "Swagger LintDiff", state: CommitStatusState.PENDING }],
     });
     await expect(
       getLabelActionImpl({
@@ -330,21 +343,17 @@ describe("getLabelActionImpl", () => {
     github.rest.issues.listLabelsOnIssue.mockResolvedValue({
       data: [{ name: "ARMReview" }],
     });
-    github.rest.checks.listForRef.mockResolvedValue({
-      data: {
-        check_runs: [
-          {
-            name: "Swagger LintDiff",
-            status: "completed",
-            conclusion: "success",
-          },
-          {
-            name: "Swagger Avocado",
-            status: "completed",
-            conclusion: "success",
-          },
-        ],
-      },
+    github.rest.repos.listCommitStatusesForRef.mockResolvedValue({
+      data: [
+        {
+          context: "Swagger LintDiff",
+          state: CommitStatusState.SUCCESS,
+        },
+        {
+          context: "Swagger Avocado",
+          state: CommitStatusState.SUCCESS,
+        },
+      ],
     });
 
     await expect(
diff --git a/.github/workflows/test/mocks.js b/.github/workflows/test/mocks.js
index b576ed4d3d71..2260f5675e44 100644
--- a/.github/workflows/test/mocks.js
+++ b/.github/workflows/test/mocks.js
@@ -33,6 +33,7 @@ export function createMockGithub() {
       },
       repos: {
         createCommitStatus: vi.fn(),
+        listCommitStatusesForRef: vi.fn().mockResolvedValue({ data: [] }),
         listPullRequestsAssociatedWithCommit: vi.fn().mockResolvedValue({
           data: [],
         }),

From 4b00173429f4edd4d5b337e932cf219d48035bac Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 6 Aug 2025 18:24:55 -0700
Subject: [PATCH 26/34] Revert "Update the Nginx Typespec (#36473)" (#36508)

This reverts commit fd14567eb14a86aaf4652d789e6745480092b053.
---
 .../nginx/Nginx.Management/ApiKeys.tsp        |    6 +-
 .../nginx/Nginx.Management/Certificates.tsp   |    8 +-
 .../nginx/Nginx.Management/Configurations.tsp |   12 +-
 .../Nginx.Management/NginxDeployments.tsp     |   17 +-
 .../nginx/Nginx.Management/WafPolicies.tsp    |    2 +-
 .../nginx/Nginx.Management/client.tsp         |   86 +-
 ...ApiKeys_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../ApiKeys_Delete_MaximumSet_Gen.json        |    2 +-
 .../ApiKeys_Get_MaximumSet_Gen.json           |    4 +-
 ...iKeys_ListByDeployment_MaximumSet_Gen.json |    4 +-
 ...ficates_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Certificates_Delete_MaximumSet_Gen.json   |    2 +-
 .../Certificates_Get_MaximumSet_Gen.json      |    4 +-
 ...cates_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Certificates_Update_MaximumSet_Gen.json   |    4 +-
 .../Configurations_Analyze.json               |    4 +-
 ...rations_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Configurations_Delete_MaximumSet_Gen.json |    2 +-
 .../Configurations_Get_MaximumSet_Gen.json    |    4 +-
 ...tions_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Configurations_Update_MaximumSet_Gen.json |    4 +-
 ...oyments_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 ...ginxDeployments_Delete_MaximumSet_Gen.json |    2 +-
 .../NginxDeployments_Get_MaximumSet_Gen.json  |    4 +-
 ...ts_ListByResourceGroup_MaximumSet_Gen.json |    2 +-
 ...nts_ListBySubscription_MaximumSet_Gen.json |    2 +-
 ...ListDefaultWafPolicies_MaximumSet_Gen.json |    2 +-
 ...ginxDeployments_Update_MaximumSet_Gen.json |    4 +-
 ...olicies_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../WafPolicies_Delete_MaximumSet_Gen.json    |    2 +-
 .../WafPolicies_Get_MaximumSet_Gen.json       |    4 +-
 ...icies_ListByDeployment_MaximumSet_Gen.json |    4 +-
 specification/nginx/Nginx.Management/main.tsp |    2 +-
 .../nginx/Nginx.Management/tspconfig.yaml     |    8 +-
 specification/nginx/cspell.yaml               |    2 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    6 +-
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    6 +-
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    6 +-
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../examples/Operations_List.json             |    0
 .../preview/2021-05-01-preview/swagger.json   |   37 +
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    2 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../examples/Operations_List.json             |    0
 .../preview/2024-01-01-preview/swagger.json   |   50 +-
 .../examples/Certificates_CreateOrUpdate.json |    4 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    0
 .../Configurations_CreateOrUpdate.json        |    0
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    0
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    0
 .../examples/Operations_List.json             |    0
 .../preview/2024-06-01-preview/swagger.json   |   78 +-
 .../examples/ApiKeys_CreateOrUpdate.json      |    4 +-
 .../examples/ApiKeys_Delete.json              |    0
 .../examples/ApiKeys_Get.json                 |    0
 .../examples/ApiKeys_List.json                |    0
 .../examples/Certificates_CreateOrUpdate.json |    4 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    0
 .../Configurations_CreateOrUpdate.json        |    0
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    0
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    0
 .../examples/Operations_List.json             |    0
 .../preview/2024-09-01-preview/swagger.json   |   80 +-
 .../examples/ApiKeys_CreateOrUpdate.json      |    4 +-
 .../examples/ApiKeys_Delete.json              |    0
 .../examples/ApiKeys_Get.json                 |    0
 .../examples/ApiKeys_List.json                |    0
 .../examples/Certificates_CreateOrUpdate.json |    4 +-
 .../examples/Certificates_Delete.json         |    0
 .../examples/Certificates_Get.json            |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    0
 .../Configurations_CreateOrUpdate.json        |    0
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    0
 .../examples/Deployments_Delete.json          |    0
 .../examples/Deployments_Get.json             |    0
 .../examples/Deployments_Get_AutoScale.json   |    0
 .../examples/Deployments_List.json            |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    0
 .../examples/Deployments_UpdateSubnet.json    |    0
 .../examples/Operations_List.json             |    0
 .../preview/2024-11-01-preview/swagger.json   |   88 +-
 ...ApiKeys_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../ApiKeys_Delete_MaximumSet_Gen.json        |    2 +-
 .../examples/ApiKeys_Get_MaximumSet_Gen.json  |    4 +-
 ...iKeys_ListByDeployment_MaximumSet_Gen.json |    4 +-
 ...ficates_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Certificates_Delete_MaximumSet_Gen.json   |    2 +-
 .../Certificates_Get_MaximumSet_Gen.json      |    4 +-
 ...cates_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Certificates_Update_MaximumSet_Gen.json   |    4 +-
 .../examples/Configurations_Analyze.json      |    4 +-
 ...rations_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../Configurations_Delete_MaximumSet_Gen.json |    2 +-
 .../Configurations_Get_MaximumSet_Gen.json    |    4 +-
 ...tions_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../Configurations_Update_MaximumSet_Gen.json |    4 +-
 ...oyments_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 ...ginxDeployments_Delete_MaximumSet_Gen.json |    2 +-
 .../NginxDeployments_Get_MaximumSet_Gen.json  |    4 +-
 ...ts_ListByResourceGroup_MaximumSet_Gen.json |    2 +-
 ...nts_ListBySubscription_MaximumSet_Gen.json |    2 +-
 ...ListDefaultWafPolicies_MaximumSet_Gen.json |    2 +-
 ...ginxDeployments_Update_MaximumSet_Gen.json |    4 +-
 .../Operations_List_MaximumSet_Gen.json       |    0
 .../Operations_List_MinimumSet_Gen.json       |    0
 ...olicies_CreateOrUpdate_MaximumSet_Gen.json |    6 +-
 .../WafPolicies_Delete_MaximumSet_Gen.json    |    2 +-
 .../WafPolicies_Get_MaximumSet_Gen.json       |    4 +-
 ...icies_ListByDeployment_MaximumSet_Gen.json |    4 +-
 .../preview/2025-03-01-preview/openapi.json   |  111 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    6 +-
 .../2022-08-01/examples/Certificates_Get.json |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    6 +-
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    6 +-
 .../2022-08-01/examples/Deployments_Get.json  |    0
 .../2022-08-01/examples/Deployments_List.json |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../2022-08-01/examples/Operations_List.json  |    0
 .../stable/2022-08-01}/swagger.json           |   26 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    0
 .../2023-04-01/examples/Certificates_Get.json |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    0
 .../2023-04-01/examples/Deployments_Get.json  |    0
 .../2023-04-01/examples/Deployments_List.json |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../2023-04-01/examples/Operations_List.json  |    0
 .../stable/2023-04-01/swagger.json            |   38 +-
 .../examples/Certificates_CreateOrUpdate.json |    6 +-
 .../examples/Certificates_Delete.json         |    0
 .../2023-09-01/examples/Certificates_Get.json |    2 +-
 .../examples/Certificates_List.json           |    4 +-
 .../examples/Configurations_Analysis.json     |    2 +-
 .../Configurations_CreateOrUpdate.json        |    2 +-
 .../examples/Configurations_Delete.json       |    0
 .../examples/Configurations_Get.json          |    0
 .../examples/Configurations_List.json         |    0
 .../examples/Deployments_Create.json          |    2 +-
 .../examples/Deployments_Delete.json          |    0
 .../2023-09-01/examples/Deployments_Get.json  |    0
 .../2023-09-01/examples/Deployments_List.json |    0
 .../Deployments_ListByResourceGroup.json      |    0
 .../examples/Deployments_Update.json          |    2 +-
 .../2023-09-01/examples/Operations_List.json  |    0
 .../stable/2023-09-01/swagger.json            |   50 +-
 .../examples/Certificates_CreateOrUpdate.json |   44 -
 .../examples/Certificates_Delete.json         |   18 -
 .../examples/Certificates_Get.json            |   24 -
 .../examples/Certificates_List.json           |   38 -
 .../Configurations_CreateOrUpdate.json        |   65 -
 .../examples/Configurations_Delete.json       |   18 -
 .../examples/Configurations_Get.json          |   31 -
 .../examples/Configurations_List.json         |   34 -
 .../examples/Deployments_Create.json          |  111 --
 .../examples/Deployments_Delete.json          |   17 -
 .../examples/Deployments_Get.json             |   42 -
 .../examples/Deployments_List.json            |   45 -
 .../Deployments_ListByResourceGroup.json      |   46 -
 .../examples/Deployments_Update.json          |   86 --
 .../examples/Operations_List.json             |   23 -
 .../stable/2022-08-01/swagger.json            | 1333 -----------------
 .../nginx/resource-manager/readme.md          |   78 +-
 227 files changed, 527 insertions(+), 2591 deletions(-)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Certificates_Delete.json (72%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Certificates_Get.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Certificates_List.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Configurations_Delete.json (72%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Deployments_Delete.json (69%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2021-05-01-preview/swagger.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Configurations_Analysis.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-01-01-preview/swagger.json (96%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Configurations_Analysis.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_Create.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Deployments_Update.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-06-01-preview/swagger.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json (89%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/ApiKeys_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/ApiKeys_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/ApiKeys_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Configurations_Analysis.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_Create.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Deployments_Update.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-09-01-preview/swagger.json (96%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json (89%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/ApiKeys_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/ApiKeys_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/ApiKeys_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Configurations_Analysis.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_Create.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_Update.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2024-11-01-preview/swagger.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json (90%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Configurations_Analyze.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json (97%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json (93%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/preview/2025-03-01-preview/openapi.json (97%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Certificates_Delete.json (71%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Certificates_Get.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Certificates_List.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Configurations_Delete.json (71%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Deployments_Delete.json (69%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2022-08-01/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus/preview/2022-11-01-preview => NGINX.NGINXPLUS/stable/2022-08-01}/swagger.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Certificates_Get.json (92%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Certificates_List.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-04-01/swagger.json (97%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json (91%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Certificates_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Certificates_Get.json (95%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Certificates_List.json (94%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Configurations_Analysis.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json (98%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Configurations_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Configurations_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Configurations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Deployments_Create.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Deployments_Delete.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Deployments_Get.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Deployments_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Deployments_Update.json (99%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/examples/Operations_List.json (100%)
 rename specification/nginx/resource-manager/{Nginx.NginxPlus => NGINX.NGINXPLUS}/stable/2023-09-01/swagger.json (96%)
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json
 delete mode 100644 specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json

diff --git a/specification/nginx/Nginx.Management/ApiKeys.tsp b/specification/nginx/Nginx.Management/ApiKeys.tsp
index 3b459577eb0d..3bd2e247daf7 100644
--- a/specification/nginx/Nginx.Management/ApiKeys.tsp
+++ b/specification/nginx/Nginx.Management/ApiKeys.tsp
@@ -7,7 +7,7 @@ using Rest;
 using Http;
 using Azure.ResourceManager;
 
-namespace Nginx.NginxPlus;
+namespace NGINX.NGINXPLUS;
 
 /**
  * API key resource returned by the service.
@@ -44,7 +44,7 @@ model ApiKeyResponseProperties {
   /**
    * Expiry of the key in UTC date-time format.
    */
-  endDateTime?: string;
+  endDateTime: string;
 }
 
 /**
@@ -61,7 +61,7 @@ model ApiKeyRequestProperties {
   /**
    * Expiry of the key in UTC date-time format.
    */
-  endDateTime?: string;
+  endDateTime: string;
 }
 
 /**
diff --git a/specification/nginx/Nginx.Management/Certificates.tsp b/specification/nginx/Nginx.Management/Certificates.tsp
index 8915470bcdec..e37abedc8a51 100644
--- a/specification/nginx/Nginx.Management/Certificates.tsp
+++ b/specification/nginx/Nginx.Management/Certificates.tsp
@@ -6,16 +6,12 @@ import "@azure-tools/typespec-azure-resource-manager";
 using Rest;
 using Azure.ResourceManager;
 
-namespace Nginx.NginxPlus;
+namespace NGINX.NGINXPLUS;
 
 /** NginxCertificate resource */
 @parentResource(NginxDeployment)
 model Certificate is ProxyResource<NginxCertificateProperties> {
   ...ResourceNameParameter<Certificate>;
-
-  /** Gets or sets the location. */
-  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property"
-  location?: string;
 }
 
 /**
@@ -41,7 +37,7 @@ model NginxCertificateProperties {
   /**
    * The Key Vault secret ID. Example: `https://myvault.vault.azure.net/secrets/mysecret/1234567890abcdef1234567890abcdef`.
    */
-  keyVaultSecretId?: string;
+  keyVaultSecretId?: url;
 
   /**
    * The SHA1 thumbprint of the certificate.
diff --git a/specification/nginx/Nginx.Management/Configurations.tsp b/specification/nginx/Nginx.Management/Configurations.tsp
index 15dbacbfcbaf..0bd79a9e9113 100644
--- a/specification/nginx/Nginx.Management/Configurations.tsp
+++ b/specification/nginx/Nginx.Management/Configurations.tsp
@@ -7,7 +7,7 @@ using Rest;
 using Http;
 using Azure.ResourceManager;
 
-namespace Nginx.NginxPlus;
+namespace NGINX.NGINXPLUS;
 
 /**
  * Represents an Nginx configuration resource.
@@ -160,9 +160,9 @@ model NginxConfigurationRequestProperties {
 }
 
 /**
- * The request body for creating an analysis for an Nginx configuration.
+ * The request body for creating an analysis for an NGINX configuration.
  */
-@doc("The request body for creating an analysis for an Nginx configuration.")
+@doc("The request body for creating an analysis for an NGINX configuration.")
 model AnalysisCreate {
   /**
    * Configuration details for analysis.
@@ -175,7 +175,7 @@ model AnalysisCreate {
  */
 model AnalysisConfig {
   /**
-   * The root file of the Nginx config file(s). It must match one of the files' filepath.
+   * The root file of the NGINX config file(s). It must match one of the files' filepath.
    */
   rootFile?: string;
 
@@ -228,7 +228,7 @@ model AnalysisResultContent {
 }
 
 /**
- * An error object found during the analysis of an Nginx configuration.
+ * An error object found during the analysis of an NGINX configuration.
  */
 model AnalysisDiagnostic {
   /**
@@ -268,7 +268,7 @@ model AnalysisDiagnostic {
 }
 
 /**
- * A diagnostic is a message associated with an Nginx config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.
+ * A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.
  */
 model DiagnosticItem {
   /**
diff --git a/specification/nginx/Nginx.Management/NginxDeployments.tsp b/specification/nginx/Nginx.Management/NginxDeployments.tsp
index 0d11a671163d..577c24377c0a 100644
--- a/specification/nginx/Nginx.Management/NginxDeployments.tsp
+++ b/specification/nginx/Nginx.Management/NginxDeployments.tsp
@@ -7,29 +7,20 @@ using Rest;
 using Http;
 using Azure.ResourceManager;
 
-namespace Nginx.NginxPlus;
+namespace NGINX.NGINXPLUS;
 
 /**
  * Represents an Nginx deployment resource.
  */
-#suppress "@azure-tools/typespec-azure-core/no-private-usage"
-#suppress "@azure-tools/typespec-azure-core/composition-over-inheritance"
-@Azure.ResourceManager.Private.armResourceInternal(NginxDeploymentProperties)
-@TypeSpec.Http.Private.includeInapplicableMetadataInPayload(false)
-model NginxDeployment extends Foundations.TrackedResource {
+model NginxDeployment is TrackedResource<NginxDeploymentProperties> {
   /** The name of the Nginx deployment resource. */
   @pattern("^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$")
-  @key("deploymentName")
+  @key("nginxDeploymentName")
   @segment("nginxDeployments")
   @path
   name: string;
 
   ...ManagedServiceIdentityProperty;
-
-  /** The resource-specific properties for this resource. */
-  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property"
-  properties?: NginxDeploymentProperties;
-
   ...ResourceSkuProperty;
 }
 
@@ -177,7 +168,7 @@ model NginxDeploymentProperties {
   /**
    * Whether diagnostics support is enabled.
    */
-  enableDiagnosticsSupport?: boolean;
+  enableDiagnosticsSupport: boolean;
 
   /**
    * Logging configuration.
diff --git a/specification/nginx/Nginx.Management/WafPolicies.tsp b/specification/nginx/Nginx.Management/WafPolicies.tsp
index 165c36cc9656..1ec394bdaea3 100644
--- a/specification/nginx/Nginx.Management/WafPolicies.tsp
+++ b/specification/nginx/Nginx.Management/WafPolicies.tsp
@@ -6,7 +6,7 @@ import "@azure-tools/typespec-azure-resource-manager";
 using Rest;
 using Azure.ResourceManager;
 
-namespace Nginx.NginxPlus;
+namespace NGINX.NGINXPLUS;
 
 /**
  * Represents a WAF policy resource under a given Nginx deployment.
diff --git a/specification/nginx/Nginx.Management/client.tsp b/specification/nginx/Nginx.Management/client.tsp
index 8a54e1cafccb..73e45c8205df 100644
--- a/specification/nginx/Nginx.Management/client.tsp
+++ b/specification/nginx/Nginx.Management/client.tsp
@@ -2,24 +2,26 @@ import "./main.tsp";
 import "@azure-tools/typespec-client-generator-core";
 
 using Azure.ClientGenerator.Core;
-using Nginx.NginxPlus;
+using NGINX.NGINXPLUS;
 
-@@clientName(Nginx.NginxPlus, "NginxManagementClient", "javascript");
+@@clientName(NGINX.NGINXPLUS, "NginxManagementClient", "javascript");
 
-// Model name overrides
-@@clientName(Certificate, "NginxCertificate");
-@@clientName(ApiKeyRequestProperties, "NginxDeploymentApiKeyRequestProperties");
+// Method name overrides
+@@clientName(Configurations.analyze, "analysis", "!csharp");
 
+// Model name overrides
+@@clientName(Certificate, "NginxCertificate", "!csharp");
+@@clientName(ApiKey, "NginxDeploymentApiKeyResponse", "!csharp");
 @@clientName(ApiKeyResponseProperties,
   "NginxDeploymentApiKeyResponseProperties",
   "!csharp"
 );
-@@clientName(ApiKey, "NginxDeploymentApiKeyResponse", "!csharp");
 @@clientName(ApiKeyRequest, "NginxDeploymentApiKeyRequest", "!csharp");
-@@clientName(AnalysisConfig, "AnalysisCreateConfig", "!csharp");
-@@clientName(AnalysisResultContent, "AnalysisResultData", "!csharp");
+@@clientName(ApiKeyRequestProperties,
+  "NginxDeploymentApiKeyRequestProperties",
+  "!csharp"
+);
 @@clientName(Configuration, "NginxConfigurationResponse", "!csharp");
-@@clientName(DiagnosticLevel, "Level", "!csharp");
 @@clientName(NginxConfigurationProtectedFileResult,
   "NginxConfigurationProtectedFileResponse",
   "!csharp"
@@ -28,6 +30,9 @@ using Nginx.NginxPlus;
   "NginxConfigurationProtectedFileRequest",
   "!csharp"
 );
+@@clientName(AnalysisConfig, "AnalysisCreateConfig", "!csharp");
+@@clientName(AnalysisResultContent, "AnalysisResultData", "!csharp");
+@@clientName(DiagnosticLevel, "Level", "!csharp");
 
 // CommonTypes
 @@clientName(Azure.ResourceManager.CommonTypes.ManagedServiceIdentity,
@@ -44,6 +49,7 @@ using Nginx.NginxPlus;
 );
 // Sku has many more properties than ResourceSku
 @@clientName(Azure.ResourceManager.CommonTypes.Sku, "ResourceSku", "!csharp");
+
 // Anonymous model named by m4
 @@clientName(NginxAppProtect,
   "NginxDeploymentPropertiesNginxAppProtect",
@@ -69,8 +75,6 @@ using Nginx.NginxPlus;
   "!csharp"
 );
 
-// Method name overrides
-@@clientName(Configurations.analyze, "analysis", "!csharp");
 // Client name for list operations
 @@clientName(NginxDeployments.listBySubscription, "list", "!csharp");
 @@clientName(ApiKeys.listByDeployment, "list", "!csharp");
@@ -110,63 +114,3 @@ using Nginx.NginxPlus;
   "privateIpAllocationMethod",
   "java"
 );
-
-@@alternateType(Certificate.location, Azure.Core.azureLocation, "csharp");
-@@alternateType(NginxNetworkInterfaceConfiguration.subnetId,
-  Azure.Core.armResourceIdentifier,
-  "csharp"
-);
-@@alternateType(NginxPrivateIPAddress.privateIPAddress,
-  Azure.Core.ipV4Address,
-  "csharp"
-);
-@@alternateType(NginxPrivateIPAddress.subnetId,
-  Azure.Core.armResourceIdentifier,
-  "csharp"
-);
-@@alternateType(NginxCertificateProperties.keyVaultSecretCreated,
-  utcDateTime,
-  "csharp"
-);
-@@alternateType(ApiKeyResponseProperties.endDateTime, utcDateTime, "csharp");
-@@alternateType(ApiKeyRequestProperties.endDateTime, utcDateTime, "csharp");
-@@clientName(ApiKeyResponseProperties,
-  "NginxDeploymentApiKeyProperties",
-  "csharp"
-);
-@@clientName(AnalysisCreate, "NginxAnalysisContent", "csharp");
-@@clientName(AnalysisConfig, "NginxAnalysisConfig", "csharp");
-@@clientName(NginxCertificateErrorResponseBody,
-  "NginxCertificateError",
-  "csharp"
-);
-@@clientName(ActivationState, "NginxWafActivationState", "csharp");
-@@clientName(AnalysisResultContent, "NginxAnalysisResultDetails", "csharp");
-@@clientName(DiagnosticLevel, "NginxDiagnosticLevel", "csharp");
-@@clientName(Configuration, "NginxConfiguration", "csharp");
-@@clientName(NginxConfigurationResponseProperties,
-  "NginxConfigurationProperties",
-  "csharp"
-);
-@@clientName(ApiKey, "NginxDeploymentApiKey", "csharp");
-@@clientName(NginxConfigurationRequestProperties,
-  "NginxConfigurationCreateOrUpdateProperties",
-  "csharp"
-);
-
-@@clientName(AnalysisResult, "NginxAnalysisResult", "csharp");
-@@clientName(WafPolicy, "NginxDeploymentWafPolicy", "csharp");
-@@clientName(AnalysisDiagnostic, "NginxAnalysisDiagnostic", "csharp");
-@@clientName(DiagnosticItem, "NginxDiagnosticItem", "csharp");
-@@clientName(ProvisioningState, "NginxProvisioningState", "csharp");
-@@clientName(AutoScaleSettings, "NginxDeploymentAutoScaleSettings", "csharp");
-@@clientName(AutoUpgradeProfile, "NginxDeploymentAutoUpgradeProfile", "csharp");
-@@clientName(ScaleProfile, "NginxScaleProfile", "csharp");
-@@clientName(ScaleProfileCapacity, "NginxScaleProfileCapacity", "csharp");
-@@clientName(WebApplicationFirewallSettings, "NginxWafSettings", "csharp");
-@@clientName(WebApplicationFirewallStatus, "NginxWafStatus", "csharp");
-@@clientName(WebApplicationFirewallPackage, "NginxWafPackage", "csharp");
-@@clientName(WebApplicationFirewallComponentVersions,
-  "NginxWafComponentVersions",
-  "csharp"
-);
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
index f2be78b61b3b..757676f0aeb2 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "apiKeyName": "myApiKey",
     "resource": {
       "properties": {
@@ -21,7 +21,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
@@ -40,7 +40,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json
index 64a5ac53e7c5..5ac2423187d2 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json
index 9d653a0c46aa..81448b2fcd57 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
@@ -15,7 +15,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json
index f1c9809b6214..7b47487b1fba 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/ApiKeys_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -16,7 +16,7 @@
               "hint": "my secret API key hint",
               "endDateTime": "2025-05-28T20:01:03.647Z"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
             "name": "otvmugiwezqyit",
             "type": "ugslayxowhvlfgkfldbnbulh",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json
index 7ec5029b64cb..31df5ccfa883 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "resource": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
@@ -69,7 +69,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json
index 3fef6b053060..040deb691f5c 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json
index a031ed171dc4..ecc3b3fa376f 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
@@ -24,7 +24,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json
index 414257fe0c63..423277a8086c 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -25,7 +25,7 @@
                 "message": "wqvmvmvchwavboxzhrhne"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/gr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/gr",
             "name": "gr",
             "type": "moqybsvacvokh",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json
index 6ba94c2ff9a9..0e4a7a4eee88 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Certificates_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "properties": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json
index 76c564d38506..abdc08cb82a6 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Analyze.json
@@ -1,11 +1,11 @@
 {
   "operationId": "Configurations_Analyze",
-  "title": "Analyze Nginx Configuration",
+  "title": "Analyze NGINX Configuration",
   "parameters": {
     "api-version": "2025-03-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "default",
     "body": {
       "config": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json
index 9f92e17ce854..df6ecf411dfd 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "resource": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
@@ -94,7 +94,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json
index c3820d7fc430..4a2e9060c2cf 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json
index 3e0c1fa66312..50c3068a85dd 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
@@ -33,7 +33,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json
index f0ab66374762..5c1522153856 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -34,7 +34,7 @@
               },
               "rootFile": "ruslikdmiioyrmxkcdn"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
             "name": "cnhuyr",
             "type": "qmfrymjwsqqpzcj",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json
index daca4618b03a..7c0c7b751a49 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/Configurations_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "properties": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
index 41c5aeef9f86..2ca68c239215 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "resource": {
       "properties": {
         "nginxVersion": "yjvomuondmj",
@@ -202,7 +202,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
@@ -318,7 +318,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json
index 03321e90ab2a..917acb9a5867 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "202": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json
index 41d11b4c1b78..c35bc55185be 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -108,7 +108,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
index 667838d908dd..8b12f67eb20a 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
@@ -109,7 +109,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
index ca762f3165ca..a14c8ac2e996 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
@@ -108,7 +108,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
index d1b079161023..b4d206ea661a 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json
index 2d848c1e98fb..833e05870b69 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/NginxDeployments_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "properties": {
       "identity": {
         "type": "None",
@@ -201,7 +201,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
index 3334b88d29ea..1739b45fbbb7 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "wafPolicyName": "myPolicy",
     "resource": {
       "properties": {
@@ -42,7 +42,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
@@ -75,7 +75,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json
index 80c2208e3c57..28deff9d38a1 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json
index 557eaa2b4ab5..ac3ec4889ae3 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
@@ -26,7 +26,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json
index 8359aba782b7..8663bb519e3c 100644
--- a/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/Nginx.Management/examples/2025-03-01-preview/WafPolicies_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -26,7 +26,7 @@
                 "time": "2025-07-08T10:11:08.856Z"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
             "name": "edgmihyonhwbgtk",
             "type": "omdgdqbbpucftlfmxm",
             "systemData": {
diff --git a/specification/nginx/Nginx.Management/main.tsp b/specification/nginx/Nginx.Management/main.tsp
index d8ffa86ab7f4..96a4613b866f 100644
--- a/specification/nginx/Nginx.Management/main.tsp
+++ b/specification/nginx/Nginx.Management/main.tsp
@@ -16,7 +16,7 @@ using Azure.ResourceManager;
 @armProviderNamespace
 @service(#{ title: "Microsoft.Nginx.NginxPlus management service" })
 @versioned(Versions)
-namespace Nginx.NginxPlus;
+namespace NGINX.NGINXPLUS;
 
 /** The available API versions. */
 enum Versions {
diff --git a/specification/nginx/Nginx.Management/tspconfig.yaml b/specification/nginx/Nginx.Management/tspconfig.yaml
index 9beafa67440a..4cd08c8b3695 100644
--- a/specification/nginx/Nginx.Management/tspconfig.yaml
+++ b/specification/nginx/Nginx.Management/tspconfig.yaml
@@ -12,21 +12,21 @@ options:
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json"
   "@azure-tools/typespec-csharp":
     flavor: azure
-    package-dir: "Azure.ResourceManager.Nginx"
+    package-dir: "Azure.ResourceManager.Nginx.NginxPlus"
     clear-output-folder: true
     model-namespace: false
     namespace: "{package-dir}"
   "@azure-tools/typespec-python":
     flavor: azure
-    package-dir: "azure-mgmt-nginx"
-    namespace: "azure.mgmt.nginx"
+    package-dir: "azure-mgmt-nginxplus"
+    namespace: "azure.mgmt.nginxplus"
     generate-test: true
     generate-sample: true
   "@azure-tools/typespec-java":
     flavor: azure
     package-dir: "azure-resourcemanager-nginx"
     namespace: "com.azure.resourcemanager.nginx"
-    service-name: "nginx"
+    service-name: "Nginx"
   "@azure-tools/typespec-ts":
     experimental-extensible-enums: true
     package-dir: "arm-nginx"
diff --git a/specification/nginx/cspell.yaml b/specification/nginx/cspell.yaml
index 5ed272d3a948..8a26202a1fb2 100644
--- a/specification/nginx/cspell.yaml
+++ b/specification/nginx/cspell.yaml
@@ -10,7 +10,7 @@ words:
   - armnginx
   - nginxplus
 overrides:
-  - filename: '**/specification/nginx/resource-manager/Nginx.NginxPlus/**/*.json'
+  - filename: '**/specification/nginx/resource-manager/NGINX.NGINXPLUS/**/*.json'
     words:
       - autoscaled
       - autoupgrade
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
index f572b52fc811..974ca75ee3f4 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Delete.json
similarity index 72%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Delete.json
index af4ada014138..f27355b06fed 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Delete.json
@@ -8,11 +8,7 @@
   },
   "responses": {
     "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Get.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Get.json
index 2bbb35bd8448..e1ae4472f15d 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_List.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_List.json
index b914c6eae36b..03192135c284 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
index 83f4b4e015ab..4f68c26d5e11 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Delete.json
similarity index 72%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Delete.json
index 7ab2b36b87e2..6d3d9bc9df55 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Delete.json
@@ -8,11 +8,7 @@
   },
   "responses": {
     "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Create.json
index f582dab3e7d6..7dc786163e5c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Delete.json
similarity index 69%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Delete.json
index e71705e1faf8..00decef8d7b7 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Delete.json
@@ -7,11 +7,7 @@
   },
   "responses": {
     "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Update.json
index fd73c08fe6a7..aba3965cb814 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
index 4c8be2f51897..8ca9bff0afc7 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
@@ -52,6 +52,9 @@
             "description": "The name of certificate",
             "required": true,
             "type": "string"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -103,6 +106,9 @@
             "required": true,
             "type": "string"
           },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          },
           {
             "in": "body",
             "name": "body",
@@ -167,6 +173,9 @@
             "description": "The name of certificate",
             "required": true,
             "type": "string"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -316,6 +325,9 @@
             "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -367,6 +379,9 @@
             "required": true,
             "type": "string"
           },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          },
           {
             "in": "body",
             "name": "body",
@@ -431,6 +446,9 @@
             "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
             "required": true,
             "type": "string"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -477,6 +495,9 @@
           },
           {
             "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -521,6 +542,9 @@
           {
             "$ref": "#/parameters/DeploymentNameParameter"
           },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          },
           {
             "in": "body",
             "name": "body",
@@ -581,6 +605,9 @@
           {
             "$ref": "#/parameters/DeploymentNameParameter"
           },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
+          },
           {
             "in": "body",
             "name": "body",
@@ -634,6 +661,9 @@
           },
           {
             "$ref": "#/parameters/DeploymentNameParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -674,6 +704,9 @@
         "parameters": [
           {
             "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -716,6 +749,9 @@
           },
           {
             "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
+          },
+          {
+            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -796,6 +832,7 @@
         "NotSpecified"
       ],
       "type": "string",
+      "readOnly": true,
       "x-ms-enum": {
         "modelAsString": true,
         "name": "ProvisioningState"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
index 25bce17a8c39..64693ad00683 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json
index b8010f8c5413..6ebe1539d108 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json
index 34f3c21a96e7..eca299266d2f 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json
index befd3c060024..d8b9483672dc 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Analysis.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Analysis.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "config": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
index 118df7da178f..d1d7042bd13d 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json
index 7704d04960f8..68fee15a35fc 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json
index a8ad2850c896..dcf8064cfa6e 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
similarity index 96%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
index ca5c02d7c35b..83144ab1e38f 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given Nginx deployment",
+        "summary": "Get a certificate of given NGINX deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "summary": "Create or update the NGINX certificates for given NGINX deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the Nginx deployment",
+        "summary": "Deletes a certificate from the NGINX deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given Nginx deployment",
+        "summary": "List all certificates of given NGINX deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "summary": "List the NGINX configuration of given NGINX deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "summary": "Get the NGINX configuration of given NGINX deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "summary": "Create or update the NGINX configuration for given NGINX deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The Nginx configuration",
+            "description": "The NGINX configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
+        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -502,7 +502,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -513,7 +513,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The Nginx configuration to analyze",
+            "description": "The NGINX configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -545,7 +545,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the Nginx deployment",
+        "summary": "Get the NGINX deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -591,7 +591,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the Nginx deployment",
+        "summary": "Create or update the NGINX deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -654,7 +654,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the Nginx deployment",
+        "summary": "Update the NGINX deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -714,7 +714,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the Nginx deployment resource",
+        "summary": "Delete the NGINX deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -763,7 +763,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the Nginx deployments resources",
+        "summary": "List the NGINX deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -805,7 +805,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all Nginx deployments under the specified resource group.",
+        "summary": "List all NGINX deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1542,14 +1542,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an Nginx configuration.",
+      "description": "The request body for creating an analysis for an NGINX configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
+              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1601,7 +1601,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an Nginx configuration.",
+      "description": "An error object found during the analysis of an NGINX configuration.",
       "required": [
         "directive",
         "description",
@@ -1647,7 +1647,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
+      "description": "The name of targeted NGINX deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
index 8bb2ef8a80c8..a1aa34891dd9 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
index 8827e57d7a29..89f318ad0813 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
index 999d7fdf5d84..325c6357096d 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Analysis.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_CreateOrUpdate.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Create.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Deployments_Update.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
index db8f97780a03..a8783433f020 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given Nginx deployment",
+        "summary": "Get a certificate of given NGINX deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "summary": "Create or update the NGINX certificates for given NGINX deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the Nginx deployment",
+        "summary": "Deletes a certificate from the NGINX deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given Nginx deployment",
+        "summary": "List all certificates of given NGINX deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "summary": "List the NGINX configuration of given NGINX deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "summary": "Get the NGINX configuration of given NGINX deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "summary": "Create or update the NGINX configuration for given NGINX deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The Nginx configuration",
+            "description": "The NGINX configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
+        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -502,7 +502,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -513,7 +513,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The Nginx configuration to analyze",
+            "description": "The NGINX configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -545,7 +545,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the Nginx deployment",
+        "summary": "Get the NGINX deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -591,7 +591,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the Nginx deployment",
+        "summary": "Create or update the NGINX deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -654,7 +654,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the Nginx deployment",
+        "summary": "Update the NGINX deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -714,7 +714,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the Nginx deployment resource",
+        "summary": "Delete the NGINX deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -763,7 +763,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the Nginx deployments resources",
+        "summary": "List the NGINX deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -805,7 +805,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all Nginx deployments under the specified resource group.",
+        "summary": "List all NGINX deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1385,7 +1385,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Settings for Nginx App Protect (NAP)",
+          "description": "Settings for NGINX App Protect (NAP)",
           "required": [
             "webApplicationFirewallSettings"
           ],
@@ -1461,7 +1461,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Update settings for Nginx App Protect (NAP)",
+          "description": "Update settings for NGINX App Protect (NAP)",
           "properties": {
             "webApplicationFirewallSettings": {
               "$ref": "#/definitions/WebApplicationFirewallSettings"
@@ -1567,14 +1567,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an Nginx configuration.",
+      "description": "The request body for creating an analysis for an NGINX configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
+              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1626,7 +1626,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an Nginx configuration.",
+      "description": "An error object found during the analysis of an NGINX configuration.",
       "required": [
         "directive",
         "description",
@@ -1669,7 +1669,7 @@
     },
     "WebApplicationFirewallSettings": {
       "type": "object",
-      "description": "Settings for the Nginx App Protect Web Application Firewall (WAF)",
+      "description": "Settings for the NGINX App Protect Web Application Firewall (WAF)",
       "properties": {
         "activationState": {
           "type": "string",
@@ -1680,40 +1680,40 @@
           "description": "The activation state of the WAF. Use 'Enabled' to enable the WAF and 'Disabled' to disable it.",
           "x-ms-enum": {
             "modelAsString": true,
-            "name": "WebApplicationFirewallSettings"
+            "name": "activationState"
           }
         }
       }
     },
     "WebApplicationFirewallStatus": {
       "type": "object",
-      "description": "The status of the Nginx App Protect Web Application Firewall",
+      "description": "The status of the NGINX App Protect Web Application Firewall",
       "properties": {
         "attackSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing attack signatures for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing attack signatures for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "botSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing bot signatures for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing bot signatures for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "threatCampaignsPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing threat campaigns for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing threat campaigns for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "componentVersions": {
           "$ref": "#/definitions/WebApplicationFirewallComponentVersions",
           "readOnly": true,
-          "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components."
+          "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components."
         }
       }
     },
     "WebApplicationFirewallPackage": {
       "type": "object",
-      "description": "Nginx App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
+      "description": "NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
       "required": [
         "version",
         "revisionDatetime"
@@ -1722,7 +1722,7 @@
         "version": {
           "type": "string",
           "example": "2.02",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) package."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) package."
         },
         "revisionDatetime": {
           "type": "string",
@@ -1739,17 +1739,17 @@
         "wafEngineVersion",
         "wafNginxVersion"
       ],
-      "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components.",
+      "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components.",
       "properties": {
         "wafEngineVersion": {
           "type": "string",
           "example": "10.624.0",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) engine."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) engine."
         },
         "wafNginxVersion": {
           "type": "string",
           "example": "4.815.0",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) module for Nginx."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) module for NGINX."
         }
       }
     }
@@ -1758,7 +1758,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
+      "description": "The name of targeted NGINX deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
similarity index 89%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
index 586ca0f6b5b8..027fa42c5c66 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_CreateOrUpdate.json
@@ -15,7 +15,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
@@ -26,7 +26,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/ApiKeys_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/ApiKeys_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
index 1ebd9c7f010e..48b3034d58bf 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Get.json
index de7a0b7369e4..314ad0ea58da 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_List.json
index 6910002817d7..7c778eff2ccb 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Analysis.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Analysis.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_CreateOrUpdate.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Create.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Create.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Update.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Deployments_Update.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
similarity index 96%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
index ba2307d2d9a6..e40b156b3a93 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
@@ -236,7 +236,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given Nginx deployment",
+        "summary": "Get a certificate of given NGINX deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -286,7 +286,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "summary": "Create or update the NGINX certificates for given NGINX deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -357,7 +357,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the Nginx deployment",
+        "summary": "Deletes a certificate from the NGINX deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -413,7 +413,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given Nginx deployment",
+        "summary": "List all certificates of given NGINX deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -461,7 +461,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "summary": "List the NGINX configuration of given NGINX deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -509,7 +509,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "summary": "Get the NGINX configuration of given NGINX deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -527,7 +527,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -559,7 +559,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "summary": "Create or update the NGINX configuration for given NGINX deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -580,7 +580,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -590,7 +590,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The Nginx configuration",
+            "description": "The NGINX configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfigurationRequest"
             }
@@ -630,7 +630,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -648,7 +648,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -686,7 +686,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
+        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -707,7 +707,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -718,7 +718,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The Nginx configuration to analyze",
+            "description": "The NGINX configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -750,7 +750,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the Nginx deployment",
+        "summary": "Get the NGINX deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -796,7 +796,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the Nginx deployment",
+        "summary": "Create or update the NGINX deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -859,7 +859,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the Nginx deployment",
+        "summary": "Update the NGINX deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -919,7 +919,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the Nginx deployment resource",
+        "summary": "Delete the NGINX deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -968,7 +968,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the Nginx deployments resources",
+        "summary": "List the NGINX deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -1010,7 +1010,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all Nginx deployments under the specified resource group.",
+        "summary": "List all NGINX deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1663,7 +1663,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Settings for Nginx App Protect (NAP)",
+          "description": "Settings for NGINX App Protect (NAP)",
           "required": [
             "webApplicationFirewallSettings"
           ],
@@ -1679,7 +1679,7 @@
         },
         "dataplaneApiEndpoint": {
           "type": "string",
-          "description": "Dataplane API endpoint for the caller to update the Nginx state of the deployment.",
+          "description": "Dataplane API endpoint for the caller to update the NGINX state of the deployment.",
           "readOnly": true
         }
       }
@@ -1744,7 +1744,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Update settings for Nginx App Protect (NAP)",
+          "description": "Update settings for NGINX App Protect (NAP)",
           "properties": {
             "webApplicationFirewallSettings": {
               "$ref": "#/definitions/WebApplicationFirewallSettings"
@@ -1937,14 +1937,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an Nginx configuration.",
+      "description": "The request body for creating an analysis for an NGINX configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
+              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1996,7 +1996,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an Nginx configuration.",
+      "description": "An error object found during the analysis of an NGINX configuration.",
       "required": [
         "directive",
         "description",
@@ -2039,7 +2039,7 @@
     },
     "WebApplicationFirewallSettings": {
       "type": "object",
-      "description": "Settings for the Nginx App Protect Web Application Firewall (WAF)",
+      "description": "Settings for the NGINX App Protect Web Application Firewall (WAF)",
       "properties": {
         "activationState": {
           "type": "string",
@@ -2050,40 +2050,40 @@
           "description": "The activation state of the WAF. Use 'Enabled' to enable the WAF and 'Disabled' to disable it.",
           "x-ms-enum": {
             "modelAsString": true,
-            "name": "WebApplicationFirewallSettings"
+            "name": "activationState"
           }
         }
       }
     },
     "WebApplicationFirewallStatus": {
       "type": "object",
-      "description": "The status of the Nginx App Protect Web Application Firewall",
+      "description": "The status of the NGINX App Protect Web Application Firewall",
       "properties": {
         "attackSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing attack signatures for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing attack signatures for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "botSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing bot signatures for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing bot signatures for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "threatCampaignsPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing threat campaigns for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing threat campaigns for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "componentVersions": {
           "$ref": "#/definitions/WebApplicationFirewallComponentVersions",
           "readOnly": true,
-          "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components."
+          "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components."
         }
       }
     },
     "WebApplicationFirewallPackage": {
       "type": "object",
-      "description": "Nginx App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
+      "description": "NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
       "required": [
         "version",
         "revisionDatetime"
@@ -2092,7 +2092,7 @@
         "version": {
           "type": "string",
           "example": "2.02",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) package."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) package."
         },
         "revisionDatetime": {
           "type": "string",
@@ -2109,17 +2109,17 @@
         "wafEngineVersion",
         "wafNginxVersion"
       ],
-      "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components.",
+      "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components.",
       "properties": {
         "wafEngineVersion": {
           "type": "string",
           "example": "10.624.0",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) engine."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) engine."
         },
         "wafNginxVersion": {
           "type": "string",
           "example": "4.815.0",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) module for Nginx."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) module for NGINX."
         }
       }
     }
@@ -2128,7 +2128,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
+      "description": "The name of targeted NGINX deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
similarity index 89%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
index 1a7668d68651..6a8f688cad1e 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_CreateOrUpdate.json
@@ -15,7 +15,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
@@ -26,7 +26,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/myApiKey",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/myApiKey",
         "name": "myApiKey",
         "type": "Nginx.NginxPlus/nginxDeployments/apiKeys",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/ApiKeys_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/ApiKeys_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
index 68d84b7fab12..cec2f11b7e2c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_CreateOrUpdate.json
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json
index 95dad8d130d2..46776cd1c221 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json
index 141c44958f05..f9b5e0d7033d 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Analysis.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Analysis.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_CreateOrUpdate.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Create.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Create.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Get_AutoScale.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Update.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_Update.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Deployments_UpdateSubnet.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
index f3b774b96d7d..88a980dda56b 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
@@ -236,7 +236,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given Nginx deployment",
+        "summary": "Get a certificate of given NGINX deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -286,7 +286,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "summary": "Create or update the NGINX certificates for given NGINX deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -357,7 +357,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the Nginx deployment",
+        "summary": "Deletes a certificate from the NGINX deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -413,7 +413,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given Nginx deployment",
+        "summary": "List all certificates of given NGINX deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -461,7 +461,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "summary": "List the NGINX configuration of given NGINX deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -509,7 +509,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "summary": "Get the NGINX configuration of given NGINX deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -527,7 +527,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -559,7 +559,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "summary": "Create or update the NGINX configuration for given NGINX deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -580,7 +580,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -590,7 +590,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The Nginx configuration",
+            "description": "The NGINX configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfigurationRequest"
             }
@@ -630,7 +630,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -648,7 +648,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -686,7 +686,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
+        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -707,7 +707,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -718,7 +718,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The Nginx configuration to analyze",
+            "description": "The NGINX configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -750,7 +750,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the Nginx deployment",
+        "summary": "Get the NGINX deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -796,7 +796,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the Nginx deployment",
+        "summary": "Create or update the NGINX deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -859,7 +859,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the Nginx deployment",
+        "summary": "Update the NGINX deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -922,7 +922,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the Nginx deployment resource",
+        "summary": "Delete the NGINX deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -971,7 +971,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the Nginx deployments resources",
+        "summary": "List the NGINX deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -1013,7 +1013,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all Nginx deployments under the specified resource group.",
+        "summary": "List all NGINX deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1666,7 +1666,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Settings for Nginx App Protect (NAP)",
+          "description": "Settings for NGINX App Protect (NAP)",
           "required": [
             "webApplicationFirewallSettings"
           ],
@@ -1682,7 +1682,7 @@
         },
         "dataplaneApiEndpoint": {
           "type": "string",
-          "description": "Dataplane API endpoint for the caller to update the Nginx state of the deployment.",
+          "description": "Dataplane API endpoint for the caller to update the NGINX state of the deployment.",
           "readOnly": true
         }
       }
@@ -1750,7 +1750,7 @@
         },
         "nginxAppProtect": {
           "type": "object",
-          "description": "Update settings for Nginx App Protect (NAP)",
+          "description": "Update settings for NGINX App Protect (NAP)",
           "properties": {
             "webApplicationFirewallSettings": {
               "$ref": "#/definitions/WebApplicationFirewallSettings"
@@ -1943,14 +1943,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an Nginx configuration.",
+      "description": "The request body for creating an analysis for an NGINX configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
+              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -2008,7 +2008,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an Nginx configuration.",
+      "description": "An error object found during the analysis of an NGINX configuration.",
       "required": [
         "directive",
         "description",
@@ -2051,7 +2051,7 @@
     },
     "DiagnosticItem": {
       "type": "object",
-      "description": "A diagnostic is a message associated with an Nginx config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category",
+      "description": "A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.",
       "required": [
         "directive",
         "description",
@@ -2064,7 +2064,7 @@
       "properties": {
         "id": {
           "type": "string",
-          "description": "Unique identifier for the diagnostic"
+          "description": "Unique identifier for the diagnostic."
         },
         "directive": {
           "type": "string",
@@ -2072,11 +2072,11 @@
         },
         "description": {
           "type": "string",
-          "example": "Some directives cannot be overridden by the user provided configuration"
+          "example": "Some directives cannot be overridden by the user provided configuration."
         },
         "file": {
           "type": "string",
-          "description": "the filepath of the most relevant config file.",
+          "description": "The filepath of the most relevant config file.",
           "example": "nginx.conf"
         },
         "line": {
@@ -2085,7 +2085,7 @@
         },
         "message": {
           "type": "string",
-          "example": "the value will be overridden with `4000`"
+          "example": "The value will be overridden with `4000`."
         },
         "rule": {
           "type": "string",
@@ -2113,7 +2113,7 @@
     },
     "WebApplicationFirewallSettings": {
       "type": "object",
-      "description": "Settings for the Nginx App Protect Web Application Firewall (WAF)",
+      "description": "Settings for the NGINX App Protect Web Application Firewall (WAF)",
       "properties": {
         "activationState": {
           "type": "string",
@@ -2131,33 +2131,33 @@
     },
     "WebApplicationFirewallStatus": {
       "type": "object",
-      "description": "The status of the Nginx App Protect Web Application Firewall",
+      "description": "The status of the NGINX App Protect Web Application Firewall",
       "properties": {
         "attackSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing attack signatures for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing attack signatures for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "botSignaturesPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing bot signatures for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing bot signatures for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "threatCampaignsPackage": {
           "$ref": "#/definitions/WebApplicationFirewallPackage",
           "readOnly": true,
-          "description": "Package containing threat campaigns for the Nginx App Protect Web Application Firewall (WAF)."
+          "description": "Package containing threat campaigns for the NGINX App Protect Web Application Firewall (WAF)."
         },
         "componentVersions": {
           "$ref": "#/definitions/WebApplicationFirewallComponentVersions",
           "readOnly": true,
-          "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components."
+          "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components."
         }
       }
     },
     "WebApplicationFirewallPackage": {
       "type": "object",
-      "description": "Nginx App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
+      "description": "NGINX App Protect Web Application Firewall (WAF) Package. Contains the version and revision date of the package.",
       "required": [
         "version",
         "revisionDatetime"
@@ -2166,7 +2166,7 @@
         "version": {
           "type": "string",
           "example": "2.02",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) package."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) package."
         },
         "revisionDatetime": {
           "type": "string",
@@ -2183,17 +2183,17 @@
         "wafEngineVersion",
         "wafNginxVersion"
       ],
-      "description": "Versions of the Nginx App Protect Web Application Firewall (WAF) components.",
+      "description": "Versions of the NGINX App Protect Web Application Firewall (WAF) components.",
       "properties": {
         "wafEngineVersion": {
           "type": "string",
           "example": "10.624.0",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) engine."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) engine."
         },
         "wafNginxVersion": {
           "type": "string",
           "example": "4.815.0",
-          "description": "The version of the Nginx App Protect Web Application Firewall (WAF) module for Nginx."
+          "description": "The version of the NGINX App Protect Web Application Firewall (WAF) module for NGINX."
         }
       }
     }
@@ -2202,7 +2202,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
+      "description": "The name of targeted NGINX deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
index f2be78b61b3b..757676f0aeb2 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "apiKeyName": "myApiKey",
     "resource": {
       "properties": {
@@ -21,7 +21,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
@@ -40,7 +40,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
index 64a5ac53e7c5..5ac2423187d2 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
similarity index 90%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
index 9d653a0c46aa..81448b2fcd57 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "apiKeyName": "myApiKey"
   },
   "responses": {
@@ -15,7 +15,7 @@
           "hint": "my secret API key hint",
           "endDateTime": "2025-05-28T20:01:03.647Z"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
         "name": "otvmugiwezqyit",
         "type": "ugslayxowhvlfgkfldbnbulh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
index f1c9809b6214..7b47487b1fba 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/ApiKeys_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -16,7 +16,7 @@
               "hint": "my secret API key hint",
               "endDateTime": "2025-05-28T20:01:03.647Z"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/apiKeys/otvmugiwezqyit",
             "name": "otvmugiwezqyit",
             "type": "ugslayxowhvlfgkfldbnbulh",
             "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
index 7ec5029b64cb..31df5ccfa883 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "resource": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
@@ -69,7 +69,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
index 3fef6b053060..040deb691f5c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
index a031ed171dc4..ecc3b3fa376f 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate"
   },
   "responses": {
@@ -24,7 +24,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
index 414257fe0c63..423277a8086c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -25,7 +25,7 @@
                 "message": "wqvmvmvchwavboxzhrhne"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/gr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/gr",
             "name": "gr",
             "type": "moqybsvacvokh",
             "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
index 6ba94c2ff9a9..0e4a7a4eee88 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Certificates_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "certificateName": "myCertificate",
     "properties": {
       "properties": {
@@ -38,7 +38,7 @@
             "message": "wqvmvmvchwavboxzhrhne"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/myCertificate",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/myCertificate",
         "name": "gr",
         "type": "moqybsvacvokh",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Analyze.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Analyze.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Analyze.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Analyze.json
index 76c564d38506..abdc08cb82a6 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Analyze.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Analyze.json
@@ -1,11 +1,11 @@
 {
   "operationId": "Configurations_Analyze",
-  "title": "Analyze Nginx Configuration",
+  "title": "Analyze NGINX Configuration",
   "parameters": {
     "api-version": "2025-03-01-preview",
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "default",
     "body": {
       "config": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
index 9f92e17ce854..df6ecf411dfd 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "resource": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
@@ -94,7 +94,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
index c3820d7fc430..4a2e9060c2cf 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
index 3e0c1fa66312..50c3068a85dd 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration"
   },
   "responses": {
@@ -33,7 +33,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
index f0ab66374762..5c1522153856 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -34,7 +34,7 @@
               },
               "rootFile": "ruslikdmiioyrmxkcdn"
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
             "name": "cnhuyr",
             "type": "qmfrymjwsqqpzcj",
             "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
index daca4618b03a..7c0c7b751a49 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Configurations_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "configurationName": "myConfiguration",
     "properties": {
       "properties": {
@@ -57,7 +57,7 @@
           },
           "rootFile": "ruslikdmiioyrmxkcdn"
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/cnhuyr",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/configurations/cnhuyr",
         "name": "cnhuyr",
         "type": "qmfrymjwsqqpzcj",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
index 41c5aeef9f86..2ca68c239215 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "resource": {
       "properties": {
         "nginxVersion": "yjvomuondmj",
@@ -202,7 +202,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
@@ -318,7 +318,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
index 03321e90ab2a..917acb9a5867 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "202": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
similarity index 97%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
index 41d11b4c1b78..c35bc55185be 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -108,7 +108,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
index 667838d908dd..8b12f67eb20a 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListByResourceGroup_MaximumSet_Gen.json
@@ -109,7 +109,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
index ca762f3165ca..a14c8ac2e996 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListBySubscription_MaximumSet_Gen.json
@@ -108,7 +108,7 @@
               "key6788": "ocbflwfgetcdxdhnwe"
             },
             "location": "dmy",
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/zpngfjhytajcvheoayopelklmzzpk",
             "name": "zpngfjhytajcvheoayopelklmzzpk",
             "type": "cxgktqvbtlxwjzc",
             "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
index d1b079161023..b4d206ea661a 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_ListDefaultWafPolicies_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
index 2d848c1e98fb..833e05870b69 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/NginxDeployments_Update_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "properties": {
       "identity": {
         "type": "None",
@@ -201,7 +201,7 @@
           "key6788": "ocbflwfgetcdxdhnwe"
         },
         "location": "dmy",
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment",
         "name": "zpngfjhytajcvheoayopelklmzzpk",
         "type": "cxgktqvbtlxwjzc",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MaximumSet_Gen.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/Operations_List_MinimumSet_Gen.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
index 3334b88d29ea..1739b45fbbb7 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_CreateOrUpdate_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "wafPolicyName": "myPolicy",
     "resource": {
       "properties": {
@@ -42,7 +42,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
@@ -75,7 +75,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
index 80c2208e3c57..28deff9d38a1 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Delete_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
index 557eaa2b4ab5..ac3ec4889ae3 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_Get_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment",
+    "nginxDeploymentName": "myDeployment",
     "wafPolicyName": "myWafPolicy"
   },
   "responses": {
@@ -26,7 +26,7 @@
             "time": "2025-07-08T10:11:08.856Z"
           }
         },
-        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
+        "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/mnoduokxduh",
         "name": "mnoduokxduh",
         "type": "whzfegwwpdsezgtwhzce",
         "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
similarity index 93%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
index 8359aba782b7..8663bb519e3c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/examples/WafPolicies_ListByDeployment_MaximumSet_Gen.json
@@ -5,7 +5,7 @@
     "api-version": "2025-03-01-preview",
     "subscriptionId": "333F7B80-063D-40E5-975B-6E3C3CAC8296",
     "resourceGroupName": "rgopenapi",
-    "deploymentName": "myDeployment"
+    "nginxDeploymentName": "myDeployment"
   },
   "responses": {
     "200": {
@@ -26,7 +26,7 @@
                 "time": "2025-07-08T10:11:08.856Z"
               }
             },
-            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
+            "id": "/subscriptions/333F7B80-063D-40E5-975B-6E3C3CAC8296/resourceGroups/rgopenapi/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/wafPolicies/edgmihyonhwbgtk",
             "name": "edgmihyonhwbgtk",
             "type": "omdgdqbbpucftlfmxm",
             "systemData": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
similarity index 97%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
index c81c1381bcc6..ed1af07c7b03 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
@@ -59,7 +59,7 @@
     }
   ],
   "paths": {
-    "/providers/Nginx.NginxPlus/operations": {
+    "/providers/NGINX.NGINXPLUS/operations": {
       "get": {
         "operationId": "Operations_List",
         "tags": [
@@ -98,7 +98,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments": {
+    "/subscriptions/{subscriptionId}/providers/NGINX.NGINXPLUS/nginxDeployments": {
       "get": {
         "operationId": "NginxDeployments_ListBySubscription",
         "tags": [
@@ -137,7 +137,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments": {
       "get": {
         "operationId": "NginxDeployments_ListByResourceGroup",
         "tags": [
@@ -179,7 +179,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}": {
       "get": {
         "operationId": "NginxDeployments_Get",
         "tags": [
@@ -197,7 +197,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -242,7 +242,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -317,7 +317,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -371,7 +371,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -415,7 +415,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys": {
       "get": {
         "operationId": "ApiKeys_ListByDeployment",
         "tags": [
@@ -433,7 +433,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -465,7 +465,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/apiKeys/{apiKeyName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}": {
       "get": {
         "operationId": "ApiKeys_Get",
         "tags": [
@@ -483,7 +483,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -536,7 +536,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -611,7 +611,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -663,7 +663,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates": {
       "get": {
         "operationId": "Certificates_ListByDeployment",
         "tags": [
@@ -681,7 +681,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -713,7 +713,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates/{certificateName}": {
       "get": {
         "operationId": "Certificates_Get",
         "tags": [
@@ -731,7 +731,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -784,7 +784,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -867,7 +867,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -929,7 +929,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -981,7 +981,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations": {
       "get": {
         "operationId": "Configurations_ListByDeployment",
         "tags": [
@@ -999,7 +999,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1031,7 +1031,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}": {
       "get": {
         "operationId": "Configurations_Get",
         "tags": [
@@ -1049,7 +1049,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1102,7 +1102,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1177,7 +1177,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1239,7 +1239,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1291,7 +1291,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}/analyze": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}/analyze": {
       "post": {
         "operationId": "Configurations_Analyze",
         "tags": [
@@ -1309,7 +1309,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1349,13 +1349,13 @@
           }
         },
         "x-ms-examples": {
-          "Analyze Nginx Configuration": {
+          "Analyze NGINX Configuration": {
             "$ref": "./examples/Configurations_Analyze.json"
           }
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/listDefaultWafPolicies": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/listDefaultWafPolicies": {
       "post": {
         "operationId": "NginxDeployments_ListDefaultWafPolicies",
         "tags": [
@@ -1373,7 +1373,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1402,7 +1402,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/wafPolicies": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies": {
       "get": {
         "operationId": "WafPolicies_ListByDeployment",
         "tags": [
@@ -1420,7 +1420,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1452,7 +1452,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/wafPolicies/{wafPolicyName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies/{wafPolicyName}": {
       "get": {
         "operationId": "WafPolicies_Get",
         "tags": [
@@ -1470,7 +1470,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1523,7 +1523,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1606,7 +1606,7 @@
             "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "name": "deploymentName",
+            "name": "nginxDeploymentName",
             "in": "path",
             "description": "The name of the Nginx deployment resource.",
             "required": true,
@@ -1690,7 +1690,7 @@
       "properties": {
         "rootFile": {
           "type": "string",
-          "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
+          "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
         },
         "files": {
           "type": "array",
@@ -1716,7 +1716,7 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an Nginx configuration.",
+      "description": "The request body for creating an analysis for an NGINX configuration.",
       "properties": {
         "config": {
           "$ref": "#/definitions/AnalysisConfig",
@@ -1729,7 +1729,7 @@
     },
     "AnalysisDiagnostic": {
       "type": "object",
-      "description": "An error object found during the analysis of an Nginx configuration.",
+      "description": "An error object found during the analysis of an NGINX configuration.",
       "properties": {
         "id": {
           "type": "string",
@@ -1874,7 +1874,8 @@
         }
       },
       "required": [
-        "secretText"
+        "secretText",
+        "endDateTime"
       ]
     },
     "ApiKeyResponseProperties": {
@@ -1891,7 +1892,8 @@
         }
       },
       "required": [
-        "hint"
+        "hint",
+        "endDateTime"
       ]
     },
     "AutoScaleSettings": {
@@ -2008,10 +2010,6 @@
         "properties": {
           "$ref": "#/definitions/NginxCertificateProperties",
           "description": "The resource-specific properties for this resource."
-        },
-        "location": {
-          "type": "string",
-          "description": "Gets or sets the location."
         }
       },
       "allOf": [
@@ -2045,10 +2043,6 @@
       "type": "object",
       "description": "The type used for update operations of the Certificate.",
       "properties": {
-        "location": {
-          "type": "string",
-          "description": "Gets or sets the location."
-        },
         "properties": {
           "$ref": "#/definitions/CertificateUpdateProperties",
           "description": "The resource-specific properties for this resource."
@@ -2069,6 +2063,7 @@
         },
         "keyVaultSecretId": {
           "type": "string",
+          "format": "uri",
           "description": "The Key Vault secret ID. Example: `https://myvault.vault.azure.net/secrets/mysecret/1234567890abcdef1234567890abcdef`."
         },
         "sha1Thumbprint": {
@@ -2217,7 +2212,7 @@
     },
     "DiagnosticItem": {
       "type": "object",
-      "description": "A diagnostic is a message associated with an Nginx config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.",
+      "description": "A diagnostic is a message associated with an NGINX config. The Analyzer returns diagnostics with a level indicating the importance of the diagnostic with optional category.",
       "properties": {
         "id": {
           "type": "string",
@@ -2426,6 +2421,7 @@
         },
         "keyVaultSecretId": {
           "type": "string",
+          "format": "uri",
           "description": "The Key Vault secret ID. Example: `https://myvault.vault.azure.net/secrets/mysecret/1234567890abcdef1234567890abcdef`."
         },
         "sha1Thumbprint": {
@@ -2606,14 +2602,14 @@
       "type": "object",
       "description": "Represents an Nginx deployment resource.",
       "properties": {
-        "identity": {
-          "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
-          "description": "The managed service identities assigned to this resource."
-        },
         "properties": {
           "$ref": "#/definitions/NginxDeploymentProperties",
           "description": "The resource-specific properties for this resource."
         },
+        "identity": {
+          "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity",
+          "description": "The managed service identities assigned to this resource."
+        },
         "sku": {
           "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/Sku",
           "description": "The SKU (Stock Keeping Unit) assigned to this resource."
@@ -2805,6 +2801,7 @@
         "nginxVersion",
         "networkProfile",
         "ipAddress",
+        "enableDiagnosticsSupport",
         "logging",
         "scalingProperties",
         "autoUpgradeProfile",
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
index 378105c4fc8f..e1c7066b8bcd 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Delete.json
similarity index 71%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Delete.json
index 5add46b5a4db..af9031d0419d 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Delete.json
@@ -8,11 +8,7 @@
   },
   "responses": {
     "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Get.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Get.json
index 48b1147f5dab..6ba9c1a58d28 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_List.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_List.json
index 3b33f41a2823..05efc6174b2f 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
index 07e100e1cc1b..ac0e2cec6572 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Delete.json
similarity index 71%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Delete.json
index bf1a0d68a71e..b6152093de3b 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Delete.json
@@ -8,11 +8,7 @@
   },
   "responses": {
     "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Create.json
index 87adc0c64904..92290b83747f 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Delete.json
similarity index 69%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Delete.json
index 411aeb846bec..78e6ffc0794f 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Delete.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Delete.json
@@ -7,11 +7,7 @@
   },
   "responses": {
     "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
+    "202": {},
     "204": {}
   }
 }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Update.json
index 43aa12827cf8..065b791705a9 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
index 73d7b997d7af..6f165da0f93c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "Nginx.NginxPlus",
-    "version": "2022-11-01-preview"
+    "version": "2022-08-01"
   },
   "host": "management.azure.com",
   "schemes": [
@@ -783,7 +783,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all operations provided by Nginx.NginxPlus for the 2022-11-01-preview api version.",
+        "summary": "List all operations provided by Nginx.NginxPlus for the 2022-08-01 api version.",
         "operationId": "Operations_List",
         "produces": [
           "application/json"
@@ -919,13 +919,6 @@
       "properties": {
         "data": {
           "type": "string"
-        },
-        "protectedFiles": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "x-ms-identifiers": []
         }
       }
     },
@@ -1187,15 +1180,6 @@
         }
       }
     },
-    "NginxDeploymentScalingProperties": {
-      "type": "object",
-      "properties": {
-        "capacity": {
-          "format": "int32",
-          "type": "integer"
-        }
-      }
-    },
     "NginxDeploymentProperties": {
       "type": "object",
       "properties": {
@@ -1223,9 +1207,6 @@
         },
         "logging": {
           "$ref": "#/definitions/NginxLogging"
-        },
-        "scalingProperties": {
-          "$ref": "#/definitions/NginxDeploymentScalingProperties"
         }
       }
     },
@@ -1277,9 +1258,6 @@
         },
         "logging": {
           "$ref": "#/definitions/NginxLogging"
-        },
-        "scalingProperties": {
-          "$ref": "#/definitions/NginxDeploymentScalingProperties"
         }
       }
     },
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
index fedb7068ad97..ec2c12a42324 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Get.json
similarity index 92%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Get.json
index b103c27f36ab..62dde467a650 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_List.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_List.json
index e27f188defff..aebf9d5f681c 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -21,7 +21,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
index e1d710256fc4..5e8c8ba7b286 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Create.json
index 1dccfb52fa51..0bfb6ae74bfd 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Update.json
index ad53dc66e313..23c564edd085 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
similarity index 97%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
index 239d319ec0d0..564d6dcea2ed 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-04-01/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given Nginx deployment",
+        "summary": "Get a certificate of given NGINX deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "summary": "Create or update the NGINX certificates for given NGINX deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the Nginx deployment",
+        "summary": "Deletes a certificate from the NGINX deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given Nginx deployment",
+        "summary": "List all certificates of given NGINX deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "summary": "List the NGINX configuration of given NGINX deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "summary": "Get the NGINX configuration of given NGINX deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "summary": "Create or update the NGINX configuration for given NGINX deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The Nginx configuration",
+            "description": "The NGINX configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the Nginx deployment",
+        "summary": "Get the NGINX deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -524,7 +524,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the Nginx deployment",
+        "summary": "Create or update the NGINX deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -587,7 +587,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the Nginx deployment",
+        "summary": "Update the NGINX deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -647,7 +647,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the Nginx deployment resource",
+        "summary": "Delete the NGINX deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -696,7 +696,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the Nginx deployments resources",
+        "summary": "List the NGINX deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -738,7 +738,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all Nginx deployments under the specified resource group.",
+        "summary": "List all NGINX deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1394,7 +1394,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
+      "description": "The name of targeted NGINX deployment",
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
similarity index 91%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
index 95e26ed3613e..572a7318eef0 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "certificateName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "keyVirtualPath": "/src/cert/somekey.key",
         "certificateVirtualPath": "/src/cert/somePath.cert",
@@ -16,7 +16,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
@@ -29,7 +29,7 @@
     },
     "201": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Get.json
similarity index 95%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Get.json
index 6d39ccca313a..722510513dd7 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_Get.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_Get.json
@@ -9,7 +9,7 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/default",
         "name": "default",
         "type": "nginx.nginxplus/nginxdeployments/certificates",
         "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_List.json
similarity index 94%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_List.json
index 65502a0f044f..d46cc0d9b30e 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Certificates_List.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Certificates_List.json
@@ -10,7 +10,7 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert1",
             "name": "cert1",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
@@ -28,7 +28,7 @@
             }
           },
           {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
+            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/NGINX.NGINXPLUS/nginxDeployments/myDeployment/certificates/cert2",
             "name": "cert2",
             "type": "nginx.nginxplus/nginxdeployments/certificates",
             "properties": {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Analysis.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Analysis.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Analysis.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Analysis.json
index bdbd0c6ae700..23a8c9565660 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Analysis.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Analysis.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "config": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
similarity index 98%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
index b36cb60e3274..5bc04c16378b 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_CreateOrUpdate.json
@@ -5,7 +5,7 @@
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
     "configurationName": "default",
-    "requestBody": {
+    "body": {
       "properties": {
         "files": [
           {
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Configurations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Configurations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Create.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Create.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Create.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Create.json
index 2874ef7d4dba..b2098c1d45c9 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Create.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Create.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "name": "myDeployment",
       "tags": {
         "Environment": "Dev"
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Delete.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Delete.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Delete.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Delete.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Get.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Get.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Get.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Get.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_ListByResourceGroup.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Update.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Update.json
similarity index 99%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Update.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Update.json
index de5df133ff93..c11ddc580188 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Deployments_Update.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Deployments_Update.json
@@ -4,7 +4,7 @@
     "subscriptionId": "00000000-0000-0000-0000-000000000000",
     "resourceGroupName": "myResourceGroup",
     "deploymentName": "myDeployment",
-    "requestBody": {
+    "body": {
       "tags": {
         "Environment": "Dev"
       }
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Operations_List.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Operations_List.json
similarity index 100%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/examples/Operations_List.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/examples/Operations_List.json
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/swagger.json b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
similarity index 96%
rename from specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/swagger.json
rename to specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
index 0be627ee9aa8..2d1d578487cf 100644
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2023-09-01/swagger.json
+++ b/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
@@ -31,7 +31,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Get a certificate of given Nginx deployment",
+        "summary": "Get a certificate of given NGINX deployment",
         "operationId": "Certificates_Get",
         "produces": [
           "application/json"
@@ -81,7 +81,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
+        "summary": "Create or update the NGINX certificates for given NGINX deployment",
         "operationId": "Certificates_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -152,7 +152,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "Deletes a certificate from the Nginx deployment",
+        "summary": "Deletes a certificate from the NGINX deployment",
         "operationId": "Certificates_Delete",
         "produces": [
           "application/json"
@@ -208,7 +208,7 @@
         "tags": [
           "NginxCertificate"
         ],
-        "summary": "List all certificates of given Nginx deployment",
+        "summary": "List all certificates of given NGINX deployment",
         "operationId": "Certificates_List",
         "produces": [
           "application/json"
@@ -256,7 +256,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
+        "summary": "List the NGINX configuration of given NGINX deployment.",
         "operationId": "Configurations_List",
         "produces": [
           "application/json"
@@ -304,7 +304,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
+        "summary": "Get the NGINX configuration of given NGINX deployment",
         "operationId": "Configurations_Get",
         "produces": [
           "application/json"
@@ -322,7 +322,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -354,7 +354,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
+        "summary": "Create or update the NGINX configuration for given NGINX deployment",
         "operationId": "Configurations_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -375,7 +375,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -385,7 +385,7 @@
           {
             "in": "body",
             "name": "body",
-            "description": "The Nginx configuration",
+            "description": "The NGINX configuration",
             "schema": {
               "$ref": "#/definitions/NginxConfiguration"
             }
@@ -425,7 +425,7 @@
         "tags": [
           "NginxConfiguration"
         ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
+        "summary": "Reset the NGINX configuration of given NGINX deployment to default",
         "operationId": "Configurations_Delete",
         "produces": [
           "application/json"
@@ -443,7 +443,7 @@
           {
             "in": "path",
             "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string"
           },
@@ -481,7 +481,7 @@
         "tags": [
           "NginxConfigurationAnalysis"
         ],
-        "summary": "Analyze an Nginx configuration without applying it to the NginxaaS deployment",
+        "summary": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
         "operationId": "Configurations_Analysis",
         "consumes": [
           "application/json"
@@ -502,7 +502,7 @@
           {
             "name": "configurationName",
             "in": "path",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
+            "description": "The name of configuration, only 'default' is supported value due to the singleton of NGINX conf",
             "required": true,
             "type": "string",
             "pattern": "^[a-z][a-z0-9]*$"
@@ -513,7 +513,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "The Nginx configuration to analyze",
+            "description": "The NGINX configuration to analyze",
             "schema": {
               "$ref": "#/definitions/AnalysisCreate"
             }
@@ -545,7 +545,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Get the Nginx deployment",
+        "summary": "Get the NGINX deployment",
         "operationId": "Deployments_Get",
         "produces": [
           "application/json"
@@ -588,7 +588,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Create or update the Nginx deployment",
+        "summary": "Create or update the NGINX deployment",
         "operationId": "Deployments_CreateOrUpdate",
         "consumes": [
           "application/json"
@@ -651,7 +651,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Update the Nginx deployment",
+        "summary": "Update the NGINX deployment",
         "operationId": "Deployments_Update",
         "consumes": [
           "application/json"
@@ -711,7 +711,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "Delete the Nginx deployment resource",
+        "summary": "Delete the NGINX deployment resource",
         "operationId": "Deployments_Delete",
         "produces": [
           "application/json"
@@ -760,7 +760,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List the Nginx deployments resources",
+        "summary": "List the NGINX deployments resources",
         "operationId": "Deployments_List",
         "produces": [
           "application/json"
@@ -802,7 +802,7 @@
         "tags": [
           "NginxDeployment"
         ],
-        "summary": "List all Nginx deployments under the specified resource group.",
+        "summary": "List all NGINX deployments under the specified resource group.",
         "operationId": "Deployments_ListByResourceGroup",
         "produces": [
           "application/json"
@@ -1464,14 +1464,14 @@
     },
     "AnalysisCreate": {
       "type": "object",
-      "description": "The request body for creating an analysis for an Nginx configuration.",
+      "description": "The request body for creating an analysis for an NGINX configuration.",
       "properties": {
         "config": {
           "type": "object",
           "properties": {
             "rootFile": {
               "type": "string",
-              "description": "The root file of the Nginx config file(s). It must match one of the files' filepath."
+              "description": "The root file of the NGINX config file(s). It must match one of the files' filepath."
             },
             "files": {
               "type": "array",
@@ -1523,7 +1523,7 @@
     },
     "AnalysisError": {
       "type": "object",
-      "description": "An error object found during the analysis of an Nginx configuration.",
+      "description": "An error object found during the analysis of an NGINX configuration.",
       "required": [
         "directive",
         "description",
@@ -1569,7 +1569,7 @@
     "DeploymentNameParameter": {
       "in": "path",
       "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
+      "description": "The name of targeted NGINX deployment",
       "pattern": "^([a-z0-9A-Z][a-z0-9A-Z-]{0,28}[a-z0-9A-Z]|[a-z0-9A-Z])$",
       "required": true,
       "type": "string",
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json
deleted file mode 100644
index 20c6b276df1c..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_CreateOrUpdate.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "certificateName": "default",
-    "requestBody": {
-      "properties": {
-        "keyVirtualPath": "/src/cert/somekey.key",
-        "certificateVirtualPath": "/src/cert/somePath.cert",
-        "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
-      }
-    }
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
-        "name": "default",
-        "type": "nginx.nginxplus/nginxdeployments/certificates",
-        "properties": {
-          "provisioningState": "Succeeded",
-          "keyVirtualPath": "/src/cert/somekey.key",
-          "certificateVirtualPath": "/src/cert/somePath.cert",
-          "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
-        }
-      }
-    },
-    "201": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
-        "name": "default",
-        "type": "nginx.nginxplus/nginxdeployments/certificates",
-        "properties": {
-          "provisioningState": "Accepted",
-          "keyVirtualPath": "/src/cert/somekey.key",
-          "certificateVirtualPath": "/src/cert/somePath.cert",
-          "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json
deleted file mode 100644
index be3649a10022..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Delete.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "certificateName": "default"
-  },
-  "responses": {
-    "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
-    "204": {}
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json
deleted file mode 100644
index f8dc9b30d47f..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_Get.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "certificateName": "default"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/default",
-        "name": "default",
-        "type": "nginx.nginxplus/nginxdeployments/certificates",
-        "properties": {
-          "provisioningState": "Succeeded",
-          "keyVirtualPath": "/src/cert/somekey.key",
-          "certificateVirtualPath": "/src/cert/somePath.cert",
-          "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json
deleted file mode 100644
index f4cca33e8f12..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Certificates_List.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert1",
-            "name": "cert1",
-            "type": "nginx.nginxplus/nginxdeployments/certificates",
-            "properties": {
-              "provisioningState": "Succeeded",
-              "keyVirtualPath": "/src/cert/somekey.key",
-              "certificateVirtualPath": "/src/cert/somePath.cert",
-              "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID"
-            }
-          },
-          {
-            "id": "/subscritions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/certificates/cert2",
-            "name": "cert2",
-            "type": "nginx.nginxplus/nginxdeployments/certificates",
-            "properties": {
-              "provisioningState": "Succeeded",
-              "keyVirtualPath": "/src/cert/somekey2.key",
-              "certificateVirtualPath": "/src/cert/somePath2.cert",
-              "keyVaultSecretId": "https://someKV.vault.azure.com/someSecretID2"
-            }
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json
deleted file mode 100644
index 794eed9505e6..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_CreateOrUpdate.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "configurationName": "default",
-    "requestBody": {
-      "properties": {
-        "files": [
-          {
-            "content": "ABCDEF==",
-            "virtualPath": "/etc/nginx/nginx.conf"
-          }
-        ],
-        "package": {
-          "data": null
-        },
-        "rootFile": "/etc/nginx/nginx.conf"
-      }
-    }
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
-        "name": "default",
-        "type": "nginx.nginxplus/nginxDeployments/configurations",
-        "properties": {
-          "provisioningState": "Succeeded",
-          "files": [
-            {
-              "content": "ABCDEF==",
-              "virtualPath": "/etc/nginx/nginx.conf"
-            }
-          ],
-          "package": {
-            "data": null
-          },
-          "rootFile": "/etc/nginx/nginx.conf"
-        }
-      }
-    },
-    "201": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
-        "name": "default",
-        "type": "nginx.nginxplus/nginxDeployments/configurations",
-        "properties": {
-          "provisioningState": "Accepted",
-          "files": [
-            {
-              "content": "ABCDEF==",
-              "virtualPath": "/etc/nginx/nginx.conf"
-            }
-          ],
-          "package": {
-            "data": null
-          },
-          "rootFile": "/etc/nginx/nginx.conf"
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json
deleted file mode 100644
index 650cdd8b4852..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Delete.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "configurationName": "default"
-  },
-  "responses": {
-    "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
-    "204": {}
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json
deleted file mode 100644
index f905ee1b25c2..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_Get.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "configurationName": "default"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
-        "name": "default",
-        "type": "nginx.nginxplus/nginxDeployments/configurations",
-        "properties": {
-          "provisioningState": "Succeeded",
-          "files": [
-            {
-              "content": "ABCDEF==",
-              "virtualPath": "/etc/nginx/nginx.conf"
-            }
-          ],
-          "package": {
-            "data": null
-          },
-          "rootFile": "/etc/nginx/nginx.conf"
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json
deleted file mode 100644
index 04012da5de9f..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Configurations_List.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment/configurations/default",
-            "name": "default",
-            "type": "nginx.nginxplus/nginxDeployments/configurations",
-            "properties": {
-              "provisioningState": "Succeeded",
-              "files": [
-                {
-                  "content": "ABCDEF==",
-                  "virtualPath": "/etc/nginx/nginx.conf"
-                }
-              ],
-              "package": {
-                "data": null
-              },
-              "rootFile": "/etc/nginx/nginx.conf"
-            }
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json
deleted file mode 100644
index 21c4d3f5f62f..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Create.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "requestBody": {
-      "name": "myDeployment",
-      "tags": {
-        "Environment": "Dev"
-      },
-      "properties": {
-        "managedResourceGroup": "myManagedResourceGroup",
-        "networkProfile": {
-          "frontEndIPConfiguration": {
-            "publicIPAddresses": [
-              {
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-              }
-            ],
-            "privateIPAddresses": [
-              {
-                "privateIPAddress": "1.1.1.1",
-                "privateIPAllocationMethod": "Static",
-                "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-              }
-            ]
-          },
-          "networkInterfaceConfiguration": {
-            "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-          }
-        }
-      },
-      "location": "West US"
-    }
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-        "name": "myDeployment",
-        "type": "nginx.nginxplus/deployments",
-        "location": "westus",
-        "tags": {
-          "Environment": "Dev"
-        },
-        "properties": {
-          "provisioningState": "Succeeded",
-          "nginxVersion": "nginx-1.19.6",
-          "managedResourceGroup": "myManagedResourceGroup",
-          "ipAddress": "1.1.1.1",
-          "networkProfile": {
-            "frontEndIPConfiguration": {
-              "publicIPAddresses": [
-                {
-                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                }
-              ],
-              "privateIPAddresses": [
-                {
-                  "privateIPAddress": "1.1.1.1",
-                  "privateIPAllocationMethod": "Static",
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              ]
-            },
-            "networkInterfaceConfiguration": {
-              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-            }
-          }
-        }
-      }
-    },
-    "201": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-        "name": "myDeployment",
-        "type": "nginx.nginxplus/deployments",
-        "location": "westus",
-        "tags": {
-          "Environment": "Dev"
-        },
-        "properties": {
-          "provisioningState": "Accepted",
-          "nginxVersion": "nginx-1.19.6",
-          "managedResourceGroup": "myManagedResourceGroup",
-          "ipAddress": "1.1.1.1",
-          "networkProfile": {
-            "frontEndIPConfiguration": {
-              "publicIPAddresses": [
-                {
-                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                }
-              ],
-              "privateIPAddresses": [
-                {
-                  "privateIPAddress": "1.1.1.1",
-                  "privateIPAllocationMethod": "Static",
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              ]
-            },
-            "networkInterfaceConfiguration": {
-              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json
deleted file mode 100644
index badae143ef95..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Delete.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment"
-  },
-  "responses": {
-    "200": {},
-    "202": {
-      "headers": {
-        "Azure-AsyncOperation": "https://foo.com/operationstatus"
-      }
-    },
-    "204": {}
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json
deleted file mode 100644
index 402e8d585ea9..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Get.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-        "name": "myDeployment",
-        "type": "nginx.nginxplus/deployments",
-        "location": "westus",
-        "properties": {
-          "provisioningState": "Succeeded",
-          "nginxVersion": "nginx-1.19.6",
-          "managedResourceGroup": "myManagedResourceGroup",
-          "networkProfile": {
-            "frontEndIPConfiguration": {
-              "publicIPAddresses": [
-                {
-                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                }
-              ],
-              "privateIPAddresses": [
-                {
-                  "privateIPAddress": "1.1.1.1",
-                  "privateIPAllocationMethod": "Static",
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              ]
-            },
-            "networkInterfaceConfiguration": {
-              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json
deleted file mode 100644
index 682d69a6a53e..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_List.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-            "name": "myDeployment",
-            "type": "nginx.nginxplus/deployments",
-            "location": "westus",
-            "properties": {
-              "provisioningState": "Succeeded",
-              "nginxVersion": "nginx-1.19.6",
-              "managedResourceGroup": "myManagedResourceGroup",
-              "ipAddress": "1.1.1.1",
-              "networkProfile": {
-                "frontEndIPConfiguration": {
-                  "publicIPAddresses": [
-                    {
-                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                    }
-                  ],
-                  "privateIPAddresses": [
-                    {
-                      "privateIPAddress": "1.1.1.1",
-                      "privateIPAllocationMethod": "Static",
-                      "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                    }
-                  ]
-                },
-                "networkInterfaceConfiguration": {
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json
deleted file mode 100644
index d1732bb650e0..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_ListByResourceGroup.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-            "name": "myDeployment",
-            "type": "nginx.nginxplus/deployments",
-            "location": "westus",
-            "properties": {
-              "provisioningState": "Succeeded",
-              "nginxVersion": "nginx-1.19.6",
-              "managedResourceGroup": "myManagedResourceGroup",
-              "ipAddress": "1.1.1.1",
-              "networkProfile": {
-                "frontEndIPConfiguration": {
-                  "publicIPAddresses": [
-                    {
-                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                    }
-                  ],
-                  "privateIPAddresses": [
-                    {
-                      "privateIPAddress": "1.1.1.1",
-                      "privateIPAllocationMethod": "Static",
-                      "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                    }
-                  ]
-                },
-                "networkInterfaceConfiguration": {
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              }
-            }
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json
deleted file mode 100644
index 1503d3928f9b..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Deployments_Update.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview",
-    "subscriptionId": "00000000-0000-0000-0000-000000000000",
-    "resourceGroupName": "myResourceGroup",
-    "deploymentName": "myDeployment",
-    "requestBody": {
-      "tags": {
-        "Environment": "Dev"
-      }
-    }
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-        "name": "myDeployment",
-        "type": "nginx.nginxplus/deployments",
-        "location": "westus",
-        "tags": {
-          "Environment": "Dev"
-        },
-        "properties": {
-          "provisioningState": "Succeeded",
-          "nginxVersion": "nginx-1.19.6",
-          "managedResourceGroup": "myManagedResourceGroup",
-          "ipAddress": "1.1.1.1",
-          "networkProfile": {
-            "frontEndIPConfiguration": {
-              "publicIPAddresses": [
-                {
-                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                }
-              ],
-              "privateIPAddresses": [
-                {
-                  "privateIPAddress": "1.1.1.1",
-                  "privateIPAllocationMethod": "Static",
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              ]
-            },
-            "networkInterfaceConfiguration": {
-              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-            }
-          }
-        }
-      }
-    },
-    "201": {
-      "body": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Nginx.NginxPlus/nginxDeployments/myDeployment",
-        "name": "myDeployment",
-        "type": "nginx.nginxplus/deployments",
-        "location": "westus",
-        "tags": {
-          "Environment": "Dev"
-        },
-        "properties": {
-          "provisioningState": "Accepted",
-          "nginxVersion": "nginx-1.19.6",
-          "managedResourceGroup": "myManagedResourceGroup",
-          "networkProfile": {
-            "frontEndIPConfiguration": {
-              "publicIPAddresses": [
-                {
-                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/myPublicIPAddress"
-                }
-              ],
-              "privateIPAddresses": [
-                {
-                  "privateIPAddress": "1.1.1.1",
-                  "privateIPAllocationMethod": "Static",
-                  "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-                }
-              ]
-            },
-            "networkInterfaceConfiguration": {
-              "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json b/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json
deleted file mode 100644
index 075a15e3b4f8..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/preview/2022-11-01-preview/examples/Operations_List.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2022-11-01-preview"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "name": "Nginx.NginxPlus/nginxDeployments/write",
-            "display": {
-              "provider": "Nginx.NginxPlus",
-              "resource": "deployments",
-              "operation": "write",
-              "description": "Write deployments resource"
-            }
-          }
-        ],
-        "nextLink": null
-      }
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json b/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json
deleted file mode 100644
index c37bde481e53..000000000000
--- a/specification/nginx/resource-manager/Nginx.NginxPlus/stable/2022-08-01/swagger.json
+++ /dev/null
@@ -1,1333 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Nginx.NginxPlus",
-    "version": "2022-08-01"
-  },
-  "host": "management.azure.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "flow": "implicit",
-      "description": "Azure Active Directory OAuth2 Flow",
-      "scopes": {
-        "user_impersonation": "impersonate your user account"
-      }
-    }
-  },
-  "paths": {
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates/{certificateName}": {
-      "get": {
-        "tags": [
-          "NginxCertificate"
-        ],
-        "summary": "Get a certificate of given Nginx deployment",
-        "operationId": "Certificates_Get",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "path",
-            "name": "certificateName",
-            "description": "The name of certificate",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxCertificate"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Certificates_Get": {
-            "$ref": "./examples/Certificates_Get.json"
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "NginxCertificate"
-        ],
-        "summary": "Create or update the Nginx certificates for given Nginx deployment",
-        "operationId": "Certificates_Create",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "path",
-            "name": "certificateName",
-            "description": "The name of certificate",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "body",
-            "description": "The certificate",
-            "schema": {
-              "$ref": "#/definitions/NginxCertificate"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxCertificate"
-            }
-          },
-          "201": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxCertificate"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "azure-async-operation"
-        },
-        "x-ms-examples": {
-          "Certificates_CreateOrUpdate": {
-            "$ref": "./examples/Certificates_CreateOrUpdate.json"
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "NginxCertificate"
-        ],
-        "summary": "Deletes a certificate from the nginx deployment",
-        "operationId": "Certificates_Delete",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "path",
-            "name": "certificateName",
-            "description": "The name of certificate",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success"
-          },
-          "202": {
-            "description": "Success"
-          },
-          "204": {
-            "description": "Success"
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-examples": {
-          "Certificates_Delete": {
-            "$ref": "./examples/Certificates_Delete.json"
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/certificates": {
-      "get": {
-        "tags": [
-          "NginxCertificate"
-        ],
-        "summary": "List all certificates of given Nginx deployment",
-        "operationId": "Certificates_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxCertificateListResponse"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        },
-        "x-ms-examples": {
-          "Certificates_List": {
-            "$ref": "./examples/Certificates_List.json"
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations": {
-      "get": {
-        "tags": [
-          "NginxConfiguration"
-        ],
-        "summary": "List the Nginx configuration of given Nginx deployment.",
-        "operationId": "Configurations_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxConfigurationListResponse"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        },
-        "x-ms-examples": {
-          "Configurations_List": {
-            "$ref": "./examples/Configurations_List.json"
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}": {
-      "get": {
-        "tags": [
-          "NginxConfiguration"
-        ],
-        "summary": "Get the Nginx configuration of given Nginx deployment",
-        "operationId": "Configurations_Get",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "path",
-            "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxConfiguration"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Configurations_Get": {
-            "$ref": "./examples/Configurations_Get.json"
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "NginxConfiguration"
-        ],
-        "summary": "Create or update the Nginx configuration for given Nginx deployment",
-        "operationId": "Configurations_CreateOrUpdate",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "path",
-            "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "body",
-            "description": "The Nginx configuration",
-            "schema": {
-              "$ref": "#/definitions/NginxConfiguration"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxConfiguration"
-            }
-          },
-          "201": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxConfiguration"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "azure-async-operation"
-        },
-        "x-ms-examples": {
-          "Configurations_CreateOrUpdate": {
-            "$ref": "./examples/Configurations_CreateOrUpdate.json"
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "NginxConfiguration"
-        ],
-        "summary": "Reset the Nginx configuration of given Nginx deployment to default",
-        "operationId": "Configurations_Delete",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "path",
-            "name": "configurationName",
-            "description": "The name of configuration, only 'default' is supported value due to the singleton of Nginx conf",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success"
-          },
-          "202": {
-            "description": "Success"
-          },
-          "204": {
-            "description": "Success"
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-examples": {
-          "Configurations_Delete": {
-            "$ref": "./examples/Configurations_Delete.json"
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}": {
-      "get": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "Get the Nginx deployment",
-        "operationId": "Deployments_Get",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeployment"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Deployments_Get": {
-            "$ref": "./examples/Deployments_Get.json"
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "Create or update the Nginx deployment",
-        "operationId": "Deployments_Create",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "body",
-            "name": "body",
-            "schema": {
-              "$ref": "#/definitions/NginxDeployment"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeployment"
-            }
-          },
-          "201": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeployment"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-long-running-operation-options": {
-          "final-state-via": "azure-async-operation"
-        },
-        "x-ms-examples": {
-          "Deployments_Create": {
-            "$ref": "./examples/Deployments_Create.json"
-          }
-        }
-      },
-      "patch": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "Update the Nginx deployment",
-        "operationId": "Deployments_Update",
-        "consumes": [
-          "application/json"
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          },
-          {
-            "in": "body",
-            "name": "body",
-            "schema": {
-              "$ref": "#/definitions/NginxDeploymentUpdateParameters"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeployment"
-            }
-          },
-          "201": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeployment"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-examples": {
-          "Deployments_Update": {
-            "$ref": "./examples/Deployments_Update.json"
-          }
-        },
-        "x-ms-long-running-operation": true
-      },
-      "delete": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "Delete the Nginx deployment resource",
-        "operationId": "Deployments_Delete",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          },
-          {
-            "$ref": "#/parameters/DeploymentNameParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success"
-          },
-          "202": {
-            "description": "Success"
-          },
-          "204": {
-            "description": "Success"
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-examples": {
-          "Deployments_Delete": {
-            "$ref": "./examples/Deployments_Delete.json"
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments": {
-      "get": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "List the Nginx deployments resources",
-        "operationId": "Deployments_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeploymentListResponse"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        },
-        "x-ms-examples": {
-          "Deployments_List": {
-            "$ref": "./examples/Deployments_List.json"
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments": {
-      "get": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "List all Nginx deployments under the specified resource group.",
-        "operationId": "Deployments_ListByResourceGroup",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
-          },
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/NginxDeploymentListResponse"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        },
-        "x-ms-examples": {
-          "Deployments_ListByResourceGroup": {
-            "$ref": "./examples/Deployments_ListByResourceGroup.json"
-          }
-        }
-      }
-    },
-    "/providers/Nginx.NginxPlus/operations": {
-      "get": {
-        "tags": [
-          "NginxDeployment"
-        ],
-        "summary": "List all operations provided by Nginx.NginxPlus for the 2022-08-01 api version.",
-        "operationId": "Operations_List",
-        "produces": [
-          "application/json"
-        ],
-        "parameters": [
-          {
-            "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "$ref": "#/definitions/OperationListResult"
-            }
-          },
-          "default": {
-            "description": "Default error response.",
-            "schema": {
-              "$ref": "#/definitions/ResourceProviderDefaultErrorResponse"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        },
-        "x-ms-examples": {
-          "Operations_List": {
-            "$ref": "./examples/Operations_List.json"
-          }
-        }
-      }
-    }
-  },
-  "definitions": {
-    "ProvisioningState": {
-      "enum": [
-        "Accepted",
-        "Creating",
-        "Updating",
-        "Deleting",
-        "Succeeded",
-        "Failed",
-        "Canceled",
-        "Deleted",
-        "NotSpecified"
-      ],
-      "type": "string",
-      "x-ms-enum": {
-        "modelAsString": true,
-        "name": "ProvisioningState"
-      }
-    },
-    "NginxCertificateProperties": {
-      "type": "object",
-      "properties": {
-        "provisioningState": {
-          "$ref": "#/definitions/ProvisioningState"
-        },
-        "keyVirtualPath": {
-          "type": "string"
-        },
-        "certificateVirtualPath": {
-          "type": "string"
-        },
-        "keyVaultSecretId": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxCertificate": {
-      "type": "object",
-      "x-ms-azure-resource": true,
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true
-        },
-        "name": {
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true
-        },
-        "properties": {
-          "$ref": "#/definitions/NginxCertificateProperties"
-        },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "location": {
-          "type": "string"
-        },
-        "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
-          "readOnly": true
-        }
-      }
-    },
-    "NginxCertificateListResponse": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxCertificate"
-          }
-        },
-        "nextLink": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxConfigurationFile": {
-      "type": "object",
-      "properties": {
-        "content": {
-          "type": "string"
-        },
-        "virtualPath": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxConfigurationPackage": {
-      "type": "object",
-      "properties": {
-        "data": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxConfigurationProperties": {
-      "type": "object",
-      "properties": {
-        "provisioningState": {
-          "$ref": "#/definitions/ProvisioningState"
-        },
-        "files": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxConfigurationFile"
-          },
-          "x-ms-identifiers": []
-        },
-        "protectedFiles": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxConfigurationFile"
-          },
-          "x-ms-identifiers": []
-        },
-        "package": {
-          "$ref": "#/definitions/NginxConfigurationPackage"
-        },
-        "rootFile": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxConfiguration": {
-      "type": "object",
-      "x-ms-azure-resource": true,
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true
-        },
-        "name": {
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true
-        },
-        "properties": {
-          "$ref": "#/definitions/NginxConfigurationProperties"
-        },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "location": {
-          "type": "string"
-        },
-        "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
-          "readOnly": true
-        }
-      }
-    },
-    "NginxConfigurationListResponse": {
-      "description": "Response of a list operation.",
-      "type": "object",
-      "properties": {
-        "value": {
-          "description": "Results of a list operation.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxConfiguration"
-          }
-        },
-        "nextLink": {
-          "description": "Link to the next set of results, if any.",
-          "type": "string"
-        }
-      }
-    },
-    "ErrorResponseBody": {
-      "type": "object",
-      "properties": {
-        "code": {
-          "type": "string"
-        },
-        "message": {
-          "type": "string"
-        },
-        "target": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ErrorResponseBody"
-          },
-          "x-ms-identifiers": []
-        }
-      }
-    },
-    "ResourceProviderDefaultErrorResponse": {
-      "type": "object",
-      "properties": {
-        "error": {
-          "$ref": "#/definitions/ErrorResponseBody"
-        }
-      }
-    },
-    "IdentityType": {
-      "enum": [
-        "SystemAssigned",
-        "UserAssigned",
-        "SystemAssigned, UserAssigned",
-        "None"
-      ],
-      "type": "string",
-      "x-ms-enum": {
-        "modelAsString": true,
-        "name": "IdentityType"
-      }
-    },
-    "UserIdentityProperties": {
-      "type": "object",
-      "properties": {
-        "principalId": {
-          "type": "string",
-          "readOnly": true
-        },
-        "clientId": {
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "ResourceSku": {
-      "required": [
-        "name"
-      ],
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Name of the SKU.",
-          "type": "string"
-        }
-      }
-    },
-    "IdentityProperties": {
-      "type": "object",
-      "properties": {
-        "principalId": {
-          "type": "string",
-          "readOnly": true
-        },
-        "tenantId": {
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "$ref": "#/definitions/IdentityType"
-        },
-        "userAssignedIdentities": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/UserIdentityProperties"
-          }
-        }
-      }
-    },
-    "NginxPrivateIPAllocationMethod": {
-      "enum": [
-        "Static",
-        "Dynamic"
-      ],
-      "type": "string",
-      "x-ms-enum": {
-        "modelAsString": true,
-        "name": "NginxPrivateIPAllocationMethod"
-      }
-    },
-    "NginxPrivateIPAddress": {
-      "type": "object",
-      "properties": {
-        "privateIPAddress": {
-          "type": "string"
-        },
-        "privateIPAllocationMethod": {
-          "$ref": "#/definitions/NginxPrivateIPAllocationMethod"
-        },
-        "subnetId": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxPublicIPAddress": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxFrontendIPConfiguration": {
-      "type": "object",
-      "properties": {
-        "publicIPAddresses": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxPublicIPAddress"
-          },
-          "x-ms-identifiers": []
-        },
-        "privateIPAddresses": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxPrivateIPAddress"
-          },
-          "x-ms-identifiers": []
-        }
-      }
-    },
-    "NginxNetworkInterfaceConfiguration": {
-      "type": "object",
-      "properties": {
-        "subnetId": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxNetworkProfile": {
-      "type": "object",
-      "properties": {
-        "frontEndIPConfiguration": {
-          "$ref": "#/definitions/NginxFrontendIPConfiguration"
-        },
-        "networkInterfaceConfiguration": {
-          "$ref": "#/definitions/NginxNetworkInterfaceConfiguration"
-        }
-      }
-    },
-    "NginxStorageAccount": {
-      "type": "object",
-      "properties": {
-        "accountName": {
-          "type": "string"
-        },
-        "containerName": {
-          "type": "string"
-        }
-      }
-    },
-    "NginxLogging": {
-      "type": "object",
-      "properties": {
-        "storageAccount": {
-          "$ref": "#/definitions/NginxStorageAccount"
-        }
-      }
-    },
-    "NginxDeploymentProperties": {
-      "type": "object",
-      "properties": {
-        "provisioningState": {
-          "$ref": "#/definitions/ProvisioningState"
-        },
-        "nginxVersion": {
-          "type": "string",
-          "readOnly": true
-        },
-        "managedResourceGroup": {
-          "type": "string",
-          "description": "The managed resource group to deploy VNet injection related network resources."
-        },
-        "networkProfile": {
-          "$ref": "#/definitions/NginxNetworkProfile"
-        },
-        "ipAddress": {
-          "type": "string",
-          "description": "The IP address of the deployment.",
-          "readOnly": true
-        },
-        "enableDiagnosticsSupport": {
-          "type": "boolean"
-        },
-        "logging": {
-          "$ref": "#/definitions/NginxLogging"
-        }
-      }
-    },
-    "NginxDeployment": {
-      "type": "object",
-      "x-ms-azure-resource": true,
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true
-        },
-        "name": {
-          "type": "string",
-          "readOnly": true
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true
-        },
-        "identity": {
-          "$ref": "#/definitions/IdentityProperties"
-        },
-        "properties": {
-          "$ref": "#/definitions/NginxDeploymentProperties"
-        },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sku": {
-          "$ref": "#/definitions/ResourceSku"
-        },
-        "location": {
-          "type": "string"
-        },
-        "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
-          "readOnly": true
-        }
-      }
-    },
-    "NginxDeploymentUpdateProperties": {
-      "type": "object",
-      "properties": {
-        "enableDiagnosticsSupport": {
-          "type": "boolean"
-        },
-        "logging": {
-          "$ref": "#/definitions/NginxLogging"
-        }
-      }
-    },
-    "NginxDeploymentUpdateParameters": {
-      "type": "object",
-      "properties": {
-        "identity": {
-          "$ref": "#/definitions/IdentityProperties"
-        },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "sku": {
-          "$ref": "#/definitions/ResourceSku"
-        },
-        "location": {
-          "type": "string"
-        },
-        "properties": {
-          "$ref": "#/definitions/NginxDeploymentUpdateProperties"
-        }
-      }
-    },
-    "NginxDeploymentListResponse": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NginxDeployment"
-          }
-        },
-        "nextLink": {
-          "type": "string"
-        }
-      }
-    },
-    "OperationDisplay": {
-      "description": "The object that represents the operation.",
-      "type": "object",
-      "properties": {
-        "provider": {
-          "description": "Service provider: Nginx.NginxPlus",
-          "type": "string"
-        },
-        "resource": {
-          "description": "Type on which the operation is performed, e.g., 'deployments'.",
-          "type": "string"
-        },
-        "operation": {
-          "description": "Operation type, e.g., read, write, delete, etc.",
-          "type": "string"
-        },
-        "description": {
-          "description": "Description of the operation, e.g., 'Write deployments'.",
-          "type": "string"
-        }
-      }
-    },
-    "OperationResult": {
-      "description": "A Nginx.NginxPlus REST API operation.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "description": "Operation name: {provider}/{resource}/{operation}",
-          "type": "string"
-        },
-        "display": {
-          "description": "The object that represents the operation.",
-          "$ref": "#/definitions/OperationDisplay"
-        },
-        "isDataAction": {
-          "description": "Indicates whether the operation is a data action",
-          "type": "boolean"
-        }
-      }
-    },
-    "OperationListResult": {
-      "description": "Result of GET request to list Nginx.NginxPlus operations.",
-      "type": "object",
-      "properties": {
-        "value": {
-          "description": "List of operations supported by the Nginx.NginxPlus provider.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/OperationResult"
-          },
-          "x-ms-identifiers": []
-        },
-        "nextLink": {
-          "description": "URL to get the next set of operation list results if there are any.",
-          "type": "string"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "DeploymentNameParameter": {
-      "in": "path",
-      "name": "deploymentName",
-      "description": "The name of targeted Nginx deployment",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    }
-  }
-}
diff --git a/specification/nginx/resource-manager/readme.md b/specification/nginx/resource-manager/readme.md
index e8b8c10258bf..5692b4f27b60 100644
--- a/specification/nginx/resource-manager/readme.md
+++ b/specification/nginx/resource-manager/readme.md
@@ -4,10 +4,10 @@
 
 This is the AutoRest configuration file for Nginx.
 
----
 
-## Getting Started
 
+---
+## Getting Started
 To build the SDK for Nginx, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run:
 
 > `autorest`
@@ -19,8 +19,9 @@ To see additional help and options, run:
 
 ## Configuration
 
-### Basic Information
 
+
+### Basic Information
 These are the global settings for the Nginx API.
 
 ``` yaml
@@ -36,80 +37,80 @@ These settings apply only when `--tag=package-2025-03-01-preview` is specified o
 
 ```yaml $(tag) == 'package-2025-03-01-preview'
 input-file:
-  - Nginx.NginxPlus/preview/2025-03-01-preview/openapi.json
+  - NGINX.NGINXPLUS/preview/2025-03-01-preview/openapi.json
 
 suppressions:
   - code: GetCollectionResponseSchema
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
     reason: This is by design to avoid high bandwidth consumption as agreed with the partner
   - code: PutRequestResponseSchemeArm
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"].put
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"].put
   - code: PutRequestResponseSchemeArm
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"].put
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"].put
     reason: This is by design. We do not return provided file contents in the response. 
   - code: PutResponseCodes
     from: openapi.json
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
     reason: This is a synchronous API returns a 200 as agreed with the partner. 
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/providers/Nginx.NginxPlus/operations"]
+    where: $.paths["/providers/NGINX.NGINXPLUS/operations"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/providers/Nginx.NginxPlus/nginxDeployments"]
+    where: $.paths["/subscriptions/{subscriptionId}/providers/NGINX.NGINXPLUS/nginxDeployments"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/apiKeys/{apiKeyName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/certificates"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/certificates/{certificateName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/certificates/{certificateName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}/analyze"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/configurations/{configurationName}/analyze"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/listDefaultWafPolicies"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/listDefaultWafPolicies"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies"]
   - code: PathResourceProviderNamePascalCase
     from: openapi.json
     reason: Changing the casing of the provider Namespace would trigger rules needing us to rewrite all our previous versions
-    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{nginxDeploymentName}/wafPolicies/{wafPolicyName}"]
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/NGINX.NGINXPLUS/nginxDeployments/{nginxDeploymentName}/wafPolicies/{wafPolicyName}"]
 ```
 
 ### Tag: package-2024-11-01-preview
@@ -118,7 +119,7 @@ These settings apply only when `--tag=package-2024-11-01-preview` is specified o
 
 ```yaml $(tag) == 'package-2024-11-01-preview'
 input-file:
-  - Nginx.NginxPlus/preview/2024-11-01-preview/swagger.json
+  - NGINX.NGINXPLUS/preview/2024-11-01-preview/swagger.json
 ```
 
 ### Tag: package-2024-09-01-preview
@@ -127,7 +128,7 @@ These settings apply only when `--tag=package-2024-09-01-preview` is specified o
 
 ```yaml $(tag) == 'package-2024-09-01-preview'
 input-file:
-  - Nginx.NginxPlus/preview/2024-09-01-preview/swagger.json
+  - NGINX.NGINXPLUS/preview/2024-09-01-preview/swagger.json
 ```
 
 ### Tag: package-2024-06-01-preview
@@ -136,16 +137,17 @@ These settings apply only when `--tag=package-2024-06-01-preview` is specified o
 
 ``` yaml $(tag) == 'package-2024-06-01-preview'
 input-file:
-- Nginx.NginxPlus/preview/2024-06-01-preview/swagger.json
+- NGINX.NGINXPLUS/preview/2024-06-01-preview/swagger.json
 ```
 
+
 ### Tag: package-2024-01-01-preview
 
 These settings apply only when `--tag=package-2024-01-01-preview` is specified on the command line.
 
 ``` yaml $(tag) == 'package-2024-01-01-preview'
 input-file:
-- Nginx.NginxPlus/preview/2024-01-01-preview/swagger.json
+- NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
 ```
 
 ### Tag: package-2023-09-01
@@ -154,25 +156,17 @@ These settings apply only when `--tag=package-2023-09-01` is specified on the co
 
 ``` yaml $(tag) == 'package-2023-09-01'
 input-file:
-- Nginx.NginxPlus/stable/2023-09-01/swagger.json
+- NGINX.NGINXPLUS/stable/2023-09-01/swagger.json
 ```
 
+
 ### Tag: package-2023-04-01
 
 These settings apply only when `--tag=package-2023-04-01` is specified on the command line.
 
 ``` yaml $(tag) == 'package-2023-04-01'
 input-file:
-- Nginx.NginxPlus/stable/2023-04-01/swagger.json
-```
-
-### Tag: package-2022-11-01-preview
-
-These settings apply only when `--tag=package-2022-11-01-preview` is specified on the command line.
-
-``` yaml $(tag) == 'package-2022-11-01-preview'
-input-file:
-- Nginx.NginxPlus/preview/2022-11-01-preview/swagger.json
+- NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
 ```
 
 ### Tag: package-2022-08-01
@@ -181,7 +175,7 @@ These settings apply only when `--tag=package-2022-08-01` is specified on the co
 
 ``` yaml $(tag) == 'package-2022-08-01'
 input-file:
-- Nginx.NginxPlus/stable/2022-08-01/swagger.json
+- NGINX.NGINXPLUS/stable/2022-08-01/swagger.json
 ```
 
 ### Tag: package-2021-05-01-preview
@@ -190,18 +184,16 @@ These settings apply only when `--tag=package-2021-05-01-preview` is specified o
 
 ``` yaml $(tag) == 'package-2021-05-01-preview'
 input-file:
-- Nginx.NginxPlus/preview/2021-05-01-preview/swagger.json
+- NGINX.NGINXPLUS/preview/2021-05-01-preview/swagger.json
 ```
 
 ## Suppression
-
 ``` yaml
 directive:
   - suppress: PutRequestResponseSchemeArm
     from: swagger.json
     reason: Temporary suppression needed to avoid delays for business needs and maintain production timelines. It's also approved before in previous PR in private repo.
-```
-
+```    
 ---
 
 # Code Generation
@@ -241,4 +233,4 @@ See configuration in [readme.java.md](./readme.java.md)
 
 ## TypeScript
 
-See configuration in [readme.typescript.md](./readme.typescript.md)
+See configuration in [readme.typescript.md](./readme.typescript.md)
\ No newline at end of file

From 54b1fe18641a9af5b2c46a76befef48314a6f008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Aug 2025 18:30:44 -0700
Subject: [PATCH 27/34] Bump @azure-tools/typespec-client-generator-core
 (#36505)

Bumps the typespec group with 1 update in the / directory: [@azure-tools/typespec-client-generator-core](https://github.com/Azure/typespec-azure).


Updates `@azure-tools/typespec-client-generator-core` from 0.58.1 to 0.58.2
- [Release notes](https://github.com/Azure/typespec-azure/releases)
- [Commits](https://github.com/Azure/typespec-azure/compare/@azure-tools/typespec-client-generator-core@0.58.1...@azure-tools/typespec-client-generator-core@0.58.2)

---
updated-dependencies:
- dependency-name: "@azure-tools/typespec-client-generator-core"
  dependency-version: 0.58.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: typespec
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1743baa18069..840c4200b338 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@azure-tools/typespec-azure-resource-manager": "0.58.1",
         "@azure-tools/typespec-azure-rulesets": "0.58.0",
         "@azure-tools/typespec-client-generator-cli": "0.27.0",
-        "@azure-tools/typespec-client-generator-core": "0.58.1",
+        "@azure-tools/typespec-client-generator-core": "0.58.2",
         "@azure-tools/typespec-liftr-base": "0.8.0",
         "@azure/avocado": "^0.9.1",
         "@typespec/compiler": "1.2.1",
@@ -1205,9 +1205,9 @@
       }
     },
     "node_modules/@azure-tools/typespec-client-generator-core": {
-      "version": "0.58.1",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.58.1.tgz",
-      "integrity": "sha512-55MudCh3ma4A7PAAveqDqXbLV6iO3CpAqN9MaTcPhxIlS3z1FZnhA/gDnRO/ubTNbKJym4F7vxYBe551lbdUWQ==",
+      "version": "0.58.2",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.58.2.tgz",
+      "integrity": "sha512-8kR5TUt4SBF/JmYRxIGYpPA00cRl0TEI6R01jC8vlYEdI28HezPbsXrN9atFXucZKtbqGTwe9hH8Mmfv7nvjJA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 10748cfb9e49..47c819d04a94 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@azure-tools/typespec-azure-resource-manager": "0.58.1",
     "@azure-tools/typespec-azure-rulesets": "0.58.0",
     "@azure-tools/typespec-client-generator-cli": "0.27.0",
-    "@azure-tools/typespec-client-generator-core": "0.58.1",
+    "@azure-tools/typespec-client-generator-core": "0.58.2",
     "@azure-tools/typespec-liftr-base": "0.8.0",
     "@autorest/openapi-to-typespec": "0.11.5",
     "@azure/avocado": "^0.9.1",

From fb6e96b466e5a45bbbfb6e2a8a36ab862dfea923 Mon Sep 17 00:00:00 2001
From: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com>
Date: Thu, 7 Aug 2025 10:16:25 +0800
Subject: [PATCH 28/34] [azurestackhcivm] Update tsp config (#35961)

* Create client.tsp

* Update tspconfig.yaml

* Update tspconfig.yaml

* Update tspconfig.yaml

* update config

* Update tspconfig.yaml

* Update client.tsp

* Update cspell.yaml

---------

Co-authored-by: Chenjie Shi <tadelesh.shi@live.cn>
Co-authored-by: ReleaseHelper <ReleaseHelper>
---
 .../client.tsp                                |  6 ++++++
 .../tspconfig.yaml                            | 20 +++++++++++++++++++
 specification/azurestackhci/cspell.yaml       |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/client.tsp

diff --git a/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/client.tsp b/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/client.tsp
new file mode 100644
index 000000000000..368572d86e6c
--- /dev/null
+++ b/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/client.tsp
@@ -0,0 +1,6 @@
+import "./main.tsp";
+import "@azure-tools/typespec-client-generator-core";
+
+using Azure.ClientGenerator.Core;
+
+@@clientName(Microsoft.AzureStackHCI, "AzureStackHCIVmClient", "python");
diff --git a/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/tspconfig.yaml b/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/tspconfig.yaml
index d405a644ceab..fa4cb8c396cc 100644
--- a/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/tspconfig.yaml
+++ b/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/tspconfig.yaml
@@ -1,3 +1,6 @@
+parameters:
+  "service-dir":
+    default: "sdk/azurestackhcivm"
 emit:
   - "@azure-tools/typespec-autorest"
 options:
@@ -9,6 +12,23 @@ options:
     # `arm-resource-flattening` is only used for back-compat for specs existed on July 2024. All new service spec should NOT use this flag
     arm-resource-flattening: true
     output-file: "{azure-resource-provider-folder}/{service-name}/StackHCIVM/{version-status}/{version}/stackhcivm.json"
+  "@azure-tools/typespec-python":
+    service-dir: "sdk/azurestackhci"
+    package-dir: "azure-mgmt-azurestackhcivm"
+    namespace: "azure.mgmt.azurestackhcivm"
+    flavor: "azure"
+    generate-test: true
+    generate-sample: true
+  "@azure-tools/typespec-go":
+    service-dir: "sdk/resourcemanager/azurestackhci"
+    package-dir: "armazurestackhcivm"
+    module: "github.com/Azure/azure-sdk-for-go/{service-dir}/{package-dir}"
+    fix-const-stuttering: true
+    flavor: "azure"
+    generate-samples: true
+    generate-fakes: true
+    head-as-boolean: true
+    inject-spans: true
 linter:
   extends:
     - "@azure-tools/typespec-azure-rulesets/resource-manager"
diff --git a/specification/azurestackhci/cspell.yaml b/specification/azurestackhci/cspell.yaml
index 8135591b2919..1b64deda2e8c 100644
--- a/specification/azurestackhci/cspell.yaml
+++ b/specification/azurestackhci/cspell.yaml
@@ -27,6 +27,8 @@ words:
   - vhds
   - vhdx
   - wdac
+  - azurestackhcivm
+  - armazurestackhcivm
 overrides:
   - filename: >-
       **/specification/azurestackhci/AzureStackHCI.StackHCIVM.Management/models.tsp

From 5bbb162b4c61cf0b9709d6aa238c40b27eb2d60e Mon Sep 17 00:00:00 2001
From: Yitao Pan <yitaopan@microsoft.com>
Date: Thu, 7 Aug 2025 13:30:37 +0800
Subject: [PATCH 29/34] [Azure Container Apps] Use OK response for code
 execution (#35488)

* Use response status code 200 for sync code execution

* Format

* fix example

* fix example

* fix example

* fix example

* fix example recompile

* test

* test

* test

* restore

* test

* restore

* Test

* Test

* Test

* Test

* Test

* restore

* fix

* restore

* restore

* use 200 for all

* style

* fix examples
---
 .../CodeExecution_Execute_Async_Completed.json        |  2 +-
 .../CodeExecution_Execute_Async_Running.json          |  2 +-
 .../CodeExecution_Execute_Sync.json                   |  4 ++--
 .../CodeExecution_Execute_Async_Completed.json        |  2 +-
 .../CodeExecution_Execute_Async_Running.json          |  2 +-
 .../CodeExecution_Execute_Sync.json                   |  4 ++--
 .../app/Microsoft.App.DynamicSessions/routes.tsp      | 11 ++++-------
 .../preview/2024-10-02-preview/DynamicSessions.json   |  8 ++++----
 .../CodeExecution_Execute_Async_Completed.json        |  2 +-
 .../examples/CodeExecution_Execute_Async_Running.json |  2 +-
 .../examples/CodeExecution_Execute_Sync.json          |  4 ++--
 .../preview/2025-02-02-preview/DynamicSessions.json   |  8 ++++----
 .../CodeExecution_Execute_Async_Completed.json        |  2 +-
 .../examples/CodeExecution_Execute_Async_Running.json |  2 +-
 .../examples/CodeExecution_Execute_Sync.json          |  4 ++--
 15 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Completed.json b/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Completed.json
index 2696e7645e79..1e0cf45c6c31 100644
--- a/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Completed.json
+++ b/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Completed.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Running.json b/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Running.json
index 5425b09956df..040f0364096e 100644
--- a/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Running.json
+++ b/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Async_Running.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Sync.json b/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Sync.json
index 8eef84622944..59d2c272664b 100644
--- a/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Sync.json
+++ b/specification/app/Microsoft.App.DynamicSessions/examples/2024-10-02-preview/CodeExecution_Execute_Sync.json
@@ -12,7 +12,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
@@ -20,7 +20,7 @@
       "body": {
         "id": "testExecutionId",
         "identifier": "testSessionIdentifier",
-        "executionType": "Asynchronous",
+        "executionType": "Synchronous",
         "status": "Succeeded",
         "result": {
           "stdout": "63/n",
diff --git a/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Completed.json b/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Completed.json
index 3287e7ec3bad..d8e265260e6a 100644
--- a/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Completed.json
+++ b/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Completed.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Running.json b/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Running.json
index 72d7bfa157d1..37f7615ea031 100644
--- a/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Running.json
+++ b/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Async_Running.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Sync.json b/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Sync.json
index b91407fa5392..21226d732791 100644
--- a/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Sync.json
+++ b/specification/app/Microsoft.App.DynamicSessions/examples/2025-02-02-preview/CodeExecution_Execute_Sync.json
@@ -12,7 +12,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
@@ -20,7 +20,7 @@
       "body": {
         "id": "testExecutionId",
         "identifier": "testSessionIdentifier",
-        "executionType": "Asynchronous",
+        "executionType": "Synchronous",
         "status": "Succeeded",
         "result": {
           "stdout": "63/n",
diff --git a/specification/app/Microsoft.App.DynamicSessions/routes.tsp b/specification/app/Microsoft.App.DynamicSessions/routes.tsp
index 22e033be63f2..b9fa83380fb5 100644
--- a/specification/app/Microsoft.App.DynamicSessions/routes.tsp
+++ b/specification/app/Microsoft.App.DynamicSessions/routes.tsp
@@ -25,23 +25,20 @@ alias CodeExecutionTraits = BaseOperationTraits &
 alias CodeExecutionOperations = Azure.Core.ResourceOperations<CodeExecutionTraits>;
 
 interface CodeExecution {
-  #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "No suitable standard operation found."
   @doc("Execute code in a session.")
   @route("/executions")
-  @pollingOperation(CodeExecution.get)
-  execute is Foundations.Operation<
+  execute is RpcOperation<
     {
-      ...SessionIdentifier;
       ...ExecutionOperationIdHeader;
 
       @doc("The request to execute code.")
       @body
       codeExecutionRequest: SessionCodeExecutionRequest;
     },
-    AcceptedResponse &
-      SessionCodeExecutionResource &
+    SessionCodeExecutionResource &
       ExecutionOperationIdHeader &
-      Foundations.LongRunningStatusLocation
+      Foundations.LongRunningStatusLocation,
+    CodeExecutionTraits
   >;
 
   @doc("Get the code execution result.")
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/DynamicSessions.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/DynamicSessions.json
index 28ce2a5d7f85..b4db1f21f3d5 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/DynamicSessions.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/DynamicSessions.json
@@ -61,10 +61,10 @@
             "$ref": "#/parameters/Azure.Core.Foundations.ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/SessionIdentifier"
+            "$ref": "#/parameters/ExecutionOperationIdHeader"
           },
           {
-            "$ref": "#/parameters/ExecutionOperationIdHeader"
+            "$ref": "#/parameters/SessionIdentifier"
           },
           {
             "name": "codeExecutionRequest",
@@ -77,8 +77,8 @@
           }
         ],
         "responses": {
-          "202": {
-            "description": "The request has been accepted for processing, but processing has not yet completed.",
+          "200": {
+            "description": "The request has succeeded.",
             "schema": {
               "$ref": "#/definitions/SessionCodeExecutionResource"
             },
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Completed.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Completed.json
index 2696e7645e79..1e0cf45c6c31 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Completed.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Completed.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Running.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Running.json
index 5425b09956df..040f0364096e 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Running.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Async_Running.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Sync.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Sync.json
index 8eef84622944..59d2c272664b 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Sync.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2024-10-02-preview/examples/CodeExecution_Execute_Sync.json
@@ -12,7 +12,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
@@ -20,7 +20,7 @@
       "body": {
         "id": "testExecutionId",
         "identifier": "testSessionIdentifier",
-        "executionType": "Asynchronous",
+        "executionType": "Synchronous",
         "status": "Succeeded",
         "result": {
           "stdout": "63/n",
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/DynamicSessions.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/DynamicSessions.json
index b42e830a7eb8..8316882ab3f0 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/DynamicSessions.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/DynamicSessions.json
@@ -61,10 +61,10 @@
             "$ref": "#/parameters/Azure.Core.Foundations.ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/SessionIdentifier"
+            "$ref": "#/parameters/ExecutionOperationIdHeader"
           },
           {
-            "$ref": "#/parameters/ExecutionOperationIdHeader"
+            "$ref": "#/parameters/SessionIdentifier"
           },
           {
             "name": "codeExecutionRequest",
@@ -77,8 +77,8 @@
           }
         ],
         "responses": {
-          "202": {
-            "description": "The request has been accepted for processing, but processing has not yet completed.",
+          "200": {
+            "description": "The request has succeeded.",
             "schema": {
               "$ref": "#/definitions/SessionCodeExecutionResource"
             },
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Completed.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Completed.json
index 3287e7ec3bad..d8e265260e6a 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Completed.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Completed.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Running.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Running.json
index 72d7bfa157d1..37f7615ea031 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Running.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Async_Running.json
@@ -13,7 +13,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
diff --git a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Sync.json b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Sync.json
index b91407fa5392..21226d732791 100644
--- a/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Sync.json
+++ b/specification/app/data-plane/Microsoft.App.DynamicSessions/preview/2025-02-02-preview/examples/CodeExecution_Execute_Sync.json
@@ -12,7 +12,7 @@
     }
   },
   "responses": {
-    "202": {
+    "200": {
       "headers": {
         "operation-id": "testExecutionId",
         "Operation-Location": "operation-location-uri"
@@ -20,7 +20,7 @@
       "body": {
         "id": "testExecutionId",
         "identifier": "testSessionIdentifier",
-        "executionType": "Asynchronous",
+        "executionType": "Synchronous",
         "status": "Succeeded",
         "result": {
           "stdout": "63/n",

From 18f2567ce3faf7216f297785d8dad51f2204732f Mon Sep 17 00:00:00 2001
From: Pan Shao <97225342+pshao25@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:23:48 +0800
Subject: [PATCH 30/34] Add definition check to tsmv report (#36483)

* Add definition check to tsmv

* update

* update

* update

---------

Co-authored-by: Pan Shao <pashao@microsoft.com>
---
 .../src/commonType.ts                         |  56 ++++
 .../src/compare.ts                            | 252 +++++++++++++++++-
 .../src/index.ts                              |   4 +-
 3 files changed, 298 insertions(+), 14 deletions(-)
 create mode 100644 eng/tools/typespec-migration-validation/src/commonType.ts

diff --git a/eng/tools/typespec-migration-validation/src/commonType.ts b/eng/tools/typespec-migration-validation/src/commonType.ts
new file mode 100644
index 000000000000..723301fc98f7
--- /dev/null
+++ b/eng/tools/typespec-migration-validation/src/commonType.ts
@@ -0,0 +1,56 @@
+import path from 'path';
+import { readFileContent } from './helper.js';
+import { OpenAPI2Document, OpenAPI2Schema } from '@azure-tools/typespec-autorest';
+import { isRef } from './compare.js';
+
+export function getCommonTypeDefinition(refPath: string): [OpenAPI2Schema, OpenAPI2Document] | undefined {
+  const commonTypeInfo = getCommonTypeInfo(refPath);
+  if (!commonTypeInfo) {
+    return undefined;
+  }
+  const [filePath, definitionName] = commonTypeInfo;
+  const fileContent = readCommonTypeFile(filePath);
+  const commonTypeDefinition = fileContent.definitions?.[definitionName];
+  if (!commonTypeDefinition) {
+    return undefined;
+  }
+  return [resolveCommonTypeDefinition(commonTypeDefinition, fileContent), fileContent];
+}
+
+// For all the properties, we need to inline its type if is a reference to another common type, because we cannot resolve it outside the common type file
+function resolveCommonTypeDefinition(commonTypeDefinition: OpenAPI2Schema, fileContent: OpenAPI2Document): OpenAPI2Schema {
+  for (const property in commonTypeDefinition.properties) {
+    const propertySchema = commonTypeDefinition.properties[property];
+    if (isRef(propertySchema)) {
+      const refPath = propertySchema.$ref;
+      if (!refPath.startsWith('#/definitions/')) {
+        console.warn(`Reference ${propertySchema.$ref} is not a local definition, skipping.`);
+        continue;
+      }
+      const refDefinitionName = refPath.replace('#/definitions/', '');
+      const refDefinitionSchema = fileContent.definitions?.[refDefinitionName];
+      commonTypeDefinition.properties[property] = refDefinitionSchema ? resolveCommonTypeDefinition(refDefinitionSchema, fileContent) : propertySchema;
+    }
+  }
+  return commonTypeDefinition;
+}
+
+function getCommonTypeInfo(refPath: string): [string, string] | undefined {
+  const matchResult = refPath.match(/\/common-types\/resource-management\/(v\d)\/(.*)#\/definitions\/(.*)/);
+  if (!matchResult) {
+    return undefined;
+  }
+  const [, version, fileName, definitionName] = matchResult;
+  return [path.join(process.cwd(), '..', '..', '..', 'specification', 'common-types', 'resource-management', version, fileName), definitionName];
+}
+
+const commonTypeFileCache: Record<string, OpenAPI2Document> = {};
+function readCommonTypeFile(filePath: string): OpenAPI2Document {
+  if (commonTypeFileCache[filePath]) {
+    return commonTypeFileCache[filePath];
+  }
+  const fileContent = readFileContent(filePath);
+  const jsonContent: OpenAPI2Document = JSON.parse(fileContent);
+  commonTypeFileCache[filePath] = jsonContent;
+  return jsonContent;
+}
\ No newline at end of file
diff --git a/eng/tools/typespec-migration-validation/src/compare.ts b/eng/tools/typespec-migration-validation/src/compare.ts
index 07f818c305e7..114fc134853f 100644
--- a/eng/tools/typespec-migration-validation/src/compare.ts
+++ b/eng/tools/typespec-migration-validation/src/compare.ts
@@ -1,4 +1,5 @@
-import { HttpMethod, OpenAPI2Document, OpenAPI2Operation, OpenAPI2Response, Refable } from "@azure-tools/typespec-autorest";
+import { HttpMethod, OpenAPI2Document, OpenAPI2Operation, OpenAPI2Response, OpenAPI2Schema, OpenAPI2SchemaProperty, Ref, Refable } from "@azure-tools/typespec-autorest";
+import { getCommonTypeDefinition } from "./commonType.js";
 
 interface Diff {
   before: any;
@@ -21,16 +22,188 @@ interface PathDiff extends Diff {
   type: "path" | "parameters" | "pageable" | "longrunning" | "finalstate" | "finalresult" | "responses" | "response";
 }
 
-export function printPathDiff(diff: PathDiff): string {
-  return `| ${diff.type} | ${diff.level} | The ${diff.type} of operation "${diff.operationId}" changed: ${JSON.stringify(diff.before)} -> ${JSON.stringify(diff.after)} |\n`;
+/**
+ * properties: the property names of the definition should be the same
+ * property: the property should have same schema
+ * required: the required properties of the definition should be the same
+ */
+interface DefinitionDiff extends Diff {
+  name: string;
+  propertyName?: string;
+  changeType?: string;
+  type: "properties" | "property" | "required";
+}
+
+export function printDiff(diff: PathDiff | DefinitionDiff): string {
+  if ("operationId" in diff) {
+    return `| ${diff.type} | ${diff.level} | ${getPathDiffMessage(diff)} ${JSON.stringify(diff.before)} -> ${JSON.stringify(diff.after)} |\n`;
+  } else {
+    return `| ${diff.type} | ${diff.level} | ${getDefinitionDiffMessage(diff)} ${JSON.stringify(diff.before)} -> ${JSON.stringify(diff.after)} |\n`;
+  }
 }
 
-export function compareDocuments(oldDocument: OpenAPI2Document, newDocument: OpenAPI2Document) {
-  const diffs: PathDiff[] = [];
+function getPathDiffMessage(diff: PathDiff): string {
+  switch (diff.type) {
+    case "path":
+      return `The path for operation "${diff.operationId}" changed:`;
+    case "parameters":
+      return `The number of parameters for operation "${diff.operationId}" changed:`;
+    case "pageable":
+      return `The pageable for operation "${diff.operationId}" changed:`;
+    case "longrunning":
+      return `The long-running status for operation "${diff.operationId}" changed:`;
+    case "finalstate":
+      return `The final state for operation "${diff.operationId}" changed:`;
+    case "finalresult":
+      return `The final result schema for operation "${diff.operationId}" changed:`;
+    case "responses":
+      return `The response codes for operation "${diff.operationId}" changed:`;
+    case "response":
+      return `The response schema for operation "${diff.operationId}" changed:`;
+    default:
+      return `The ${diff.type} for operation "${diff.operationId}" changed:`;
+  }
+}
+
+function getDefinitionDiffMessage(diff: DefinitionDiff): string {
+  switch (diff.type) {
+    case "properties":
+      return `The property names of definition "${diff.name}" changed:`;
+    case "property":
+      return `The ${diff.changeType} of property "${diff.propertyName}" in definition "${diff.name}" changed:`;
+    case "required":
+      return `The required properties of definition "${diff.name}" changed:`;
+  }
+}
+
+export function compareDocuments(oldDocument: OpenAPI2Document, newDocument: OpenAPI2Document): (PathDiff | DefinitionDiff)[] {
+  const diffs: (PathDiff | DefinitionDiff)[] = [];
   diffs.push(...comparePaths(oldDocument, newDocument));
+
+  // If not exists in the new document, it might be an orphaned definition previously
+  for (const definition in newDocument.definitions ?? {}) {
+    // If not exists in old document, it might be an anonymous definition previously
+    if (oldDocument.definitions?.[definition]) {
+      diffs.push(...compareNamedDefinition(oldDocument.definitions[definition], oldDocument, newDocument.definitions![definition], newDocument, definition));
+    }
+  }
+  return diffs;
+}
+
+const definitionNameCache: Set<string> = new Set();
+function compareNamedDefinition(oldDefinition: OpenAPI2Schema, oldDocument: OpenAPI2Document, newDefinition: OpenAPI2Schema, newDocument: OpenAPI2Document, name: string): DefinitionDiff[] {
+  if (definitionNameCache.has(name)) {
+    console.warn(`Definition "${name}" has been compared before, skipping.`);
+    return [];
+  }
+  definitionNameCache.add(name);
+
+  const diffs: DefinitionDiff[] = [];
+
+  const oldRequired = oldDefinition.required || [];
+  const newRequired = newDefinition.required || [];
+
+  if (oldRequired.length !== newRequired.length ||
+    !oldRequired.every(item => newRequired.includes(item)) ||
+    !newRequired.every(item => oldRequired.includes(item))) {
+    diffs.push({
+      before: oldRequired,
+      after: newRequired,
+      name,
+      type: "required",
+      level: "warning",
+    });
+  }
+
+  const oldProperties = getAllProperties(oldDefinition, oldDocument);
+  const sortedOldProperties = Object.keys(oldProperties).sort().reduce((obj: Record<string, OpenAPI2SchemaProperty>, key) => {
+    obj[key] = oldProperties[key];
+    return obj;
+  }, {});
+
+  const newProperties = getAllProperties(newDefinition, newDocument);
+  const sortedNewProperties = Object.keys(newProperties).sort().reduce((obj: Record<string, OpenAPI2SchemaProperty>, key) => {
+    obj[key] = newProperties[key];
+    return obj;
+  }, {});
+
+  // First check if the properties are the same
+  const oldKeys = Object.keys(sortedOldProperties);
+  const newKeys = Object.keys(sortedNewProperties);
+  if (oldKeys.length !== newKeys.length) {
+    // Check if newKeys has exactly one more key and it's systemData
+    const isSystemDataOnlyDifference = newKeys.length === oldKeys.length + 1 &&
+      newKeys.filter(key => !oldKeys.includes(key)).length === 1 &&
+      newKeys.filter(key => !oldKeys.includes(key))[0] === 'systemData';
+
+    diffs.push({
+      before: oldKeys,
+      after: newKeys,
+      name,
+      type: "properties",
+      level: isSystemDataOnlyDifference ? "warning" : "error"
+    });
+  }
+  for (const key of oldKeys) {
+    if (!newKeys.includes(key)) {
+      diffs.push({
+        before: oldKeys,
+        after: newKeys,
+        name,
+        type: "properties",
+        level: "error"
+      });
+    }
+  }
+  for (const key of newKeys) {
+    if (!oldKeys.includes(key)) {
+      // Check if the only additional key is systemData
+      const additionalKeys = newKeys.filter(k => !oldKeys.includes(k));
+      const isOnlySystemData = additionalKeys.length === 1 && additionalKeys[0] === 'systemData';
+
+      diffs.push({
+        before: oldKeys,
+        after: newKeys,
+        name,
+        type: "properties",
+        level: isOnlySystemData ? "warning" : "error"
+      });
+    }
+  }
+
+  // Then check if the property types are the same
+  for (const key of oldKeys) {
+    const oldProperty = sortedOldProperties[key];
+    const newProperty = sortedNewProperties[key];
+    diffs.push(...compareDefinitionProperty(oldProperty, newProperty, oldDocument, newDocument, key, name));
+  }
+
   return diffs;
 }
 
+function compareDefinitionProperty(oldProperty: OpenAPI2SchemaProperty, newProperty: OpenAPI2SchemaProperty, oldDocument: OpenAPI2Document, newDocument: OpenAPI2Document, propertyName: string, modelName: string): DefinitionDiff[] {
+  const oldPropertySchema = resolveCommonType(oldProperty);
+  const newPropertySchema = resolveCommonType(newProperty);
+  if (isRef(oldPropertySchema) && isRef(newPropertySchema)) {
+    if (oldPropertySchema.$ref !== newPropertySchema.$ref) {
+      return [{
+        before: oldPropertySchema.$ref,
+        after: newPropertySchema.$ref,
+        name: modelName,
+        propertyName,
+        type: "property",
+        changeType: "reference",
+        level: "warning"
+      }];
+    }
+  }
+  else if (!isRef(oldPropertySchema) && !isRef(newPropertySchema)) {
+    return compareNamedDefinition(oldPropertySchema, oldDocument, newPropertySchema, newDocument, `${modelName}.${propertyName}`);
+  }
+
+  return [];
+}
+
 function comparePaths(oldDocument: OpenAPI2Document, newDocument: OpenAPI2Document): PathDiff[] {
   const oldOperations = organizeOperationById(oldDocument);
   const newOperations = organizeOperationById(newDocument);
@@ -48,7 +221,7 @@ function comparePaths(oldDocument: OpenAPI2Document, newDocument: OpenAPI2Docume
     }
     else {
       pathDiffs.push(...compareOperation(oldOperations[operationId][1], newOperations[operationId][1], operationId));
-    }    
+    }
   }
   for (const operationId in newOperations) {
     if (!oldOperations[operationId]) {
@@ -191,7 +364,7 @@ function compareLongRunning(oldOperation: OpenAPI2Operation, newOperation: OpenA
         level: "error"
       });
     }
-  }  
+  }
 
   return pathDiffs;
 }
@@ -204,7 +377,7 @@ function getResponseSchema(response: Refable<OpenAPI2Response> | undefined): str
 
   return undefined;
 }
-   
+
 
 function organizeOperationById(document: OpenAPI2Document): Record<string, [string, OpenAPI2Operation]> {
   function isHttpMethod(key: string): key is HttpMethod {
@@ -220,14 +393,14 @@ function organizeOperationById(document: OpenAPI2Document): Record<string, [stri
     ];
     return httpMethods.includes(key as HttpMethod);
   }
-    
-  const operationMap: Record<string, [string, OpenAPI2Operation]> = {};  
+
+  const operationMap: Record<string, [string, OpenAPI2Operation]> = {};
   if (!document.paths) {
     return operationMap;
   }
 
   for (const route in document.paths) {
-    const pathItem = document.paths[route];  
+    const pathItem = document.paths[route];
     for (const verb in pathItem) {
       if (isHttpMethod(verb)) {
         const operation = pathItem[verb];
@@ -237,7 +410,62 @@ function organizeOperationById(document: OpenAPI2Document): Record<string, [stri
       }
     }
   }
-  
+
   return operationMap;
 }
 
+function getAllProperties(schema: OpenAPI2Schema, document: OpenAPI2Document, properties: Record<string, OpenAPI2SchemaProperty> = {}): Record<string, OpenAPI2SchemaProperty> {
+  for (const baseSchema of schema.allOf ?? []) {
+    if (isRef(baseSchema)) {
+      const refPath = baseSchema.$ref;
+      const commonTypeDefinition = getCommonTypeDefinition(refPath);
+      if (commonTypeDefinition) {
+        getAllProperties(commonTypeDefinition[0], commonTypeDefinition[1], properties);
+      }
+      else {
+        const baseDefinition = getLocalDefinition(refPath, document);
+        if (baseDefinition) {
+          getAllProperties(baseDefinition, document, properties);
+        }
+      }
+    }
+    else {
+      if (baseSchema.properties) {
+        for (const key in baseSchema.properties) {
+          properties[key] = baseSchema.properties[key];
+        }
+      }
+    }
+  }
+
+  if (schema.properties) {
+    for (const key in schema.properties) {
+      properties[key] = schema.properties[key];
+    }
+  }
+  return properties;
+}
+
+function resolveCommonType(property: OpenAPI2SchemaProperty): OpenAPI2SchemaProperty {
+  if (isRef(property)) {
+    const { $ref, ...propertyWithoutRef } = property;
+    const commonTypeDefinition = getCommonTypeDefinition($ref);
+    if (commonTypeDefinition) {
+      return { ...propertyWithoutRef, ...commonTypeDefinition[0] };
+    }
+  }
+
+  return property;
+}
+
+function getLocalDefinition(refPath: string, document: OpenAPI2Document): OpenAPI2Schema | undefined {
+  const definitionName = refPath.split("/").pop();
+  if (!document.definitions || !document.definitions[definitionName!]) {
+    console.warn(`Reference to ${definitionName} cannot be found, skipping.`);
+  }
+  return document.definitions?.[definitionName!];
+}
+
+export function isRef<T>(value: Refable<T>): value is Ref<T> {
+  return (value as Ref<T>).$ref !== undefined;
+}
\ No newline at end of file
diff --git a/eng/tools/typespec-migration-validation/src/index.ts b/eng/tools/typespec-migration-validation/src/index.ts
index f9e3ebb6c22d..f9f92e155f90 100644
--- a/eng/tools/typespec-migration-validation/src/index.ts
+++ b/eng/tools/typespec-migration-validation/src/index.ts
@@ -18,7 +18,7 @@ import {
   formatDifferenceReport,
   formatModifiedValuesReport,
 } from "./summary.js";
-import { compareDocuments, printPathDiff } from "./compare.js";
+import { compareDocuments, printDiff } from "./compare.js";
 import { writeFile } from "fs/promises";
 
 function parseArguments() {
@@ -218,7 +218,7 @@ export async function main() {
     outputMarkdown += "| Type | Level | Message |\n";
     outputMarkdown += "| ---- | ----- | ------- |\n";
     for (const diff of compareResult) {
-      outputMarkdown += printPathDiff(diff);
+      outputMarkdown += printDiff(diff);
     }
     console.log(outputMarkdown);
   }  

From b88038e1fd9bc69a90b604d273170979bca3132a Mon Sep 17 00:00:00 2001
From: Xiaofei Cao <92354331+XiaofeiCao@users.noreply.github.com>
Date: Thu, 7 Aug 2025 17:02:40 +0800
Subject: [PATCH 31/34] java mgmt, add directive to fix search (#36239)

* directive

* fix others

* more comments on publicNetworkAccess enum

* fix syntax

---------

Co-authored-by: Scott Beddall <45376673+scbedd@users.noreply.github.com>
---
 .../search/resource-manager/readme.java.md    | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/specification/search/resource-manager/readme.java.md b/specification/search/resource-manager/readme.java.md
index 873584416435..f01fb5225e9c 100644
--- a/specification/search/resource-manager/readme.java.md
+++ b/specification/search/resource-manager/readme.java.md
@@ -2,7 +2,38 @@
 
 These settings apply only when `--java` is specified on the command line.
 
-``` yaml $(java)
+```yaml $(java)
 enable-sync-stack: false
 remove-inner: CheckNameAvailabilityOutput
+directive:
+  - from: search.json
+    where-operation: Services_Update
+    transform: >
+      $["x-ms-long-running-operation"] = true;
+    reason: Swagger bug. PATCH is LRO.
+  - from: search.json
+    where: $.definitions.SearchServiceProperties.properties.publicNetworkAccess
+    transform: >
+      $['x-ms-enum']['modelAsString'] = false;
+    reason: Handle breaking change. Also, service will return "Disabled"/"Enabled",instead of "disabled"/"enabled" defined in Swagger. Making it sealed enum will mitigate this.
+  - from: search.json
+    where: $.definitions.SharedPrivateLinkResourceProperties.properties.status
+    transform: >
+      $['x-ms-enum']['modelAsString'] = false;
+    reason: Handle breaking change.
+  - from: search.json
+    where: $.definitions.SharedPrivateLinkResourceProperties.properties.provisioningState
+    transform: >
+      $['x-ms-enum']['modelAsString'] = false;
+    reason: Handle breaking change.
+  - from: search.json
+    where: $.definitions.Identity.properties.type
+    transform: >
+      $['x-ms-enum']['modelAsString'] = false;
+    reason: Handle breaking change.
+  - from: search.json
+    where: $.definitions.Sku.properties.name
+    transform: >
+      $['x-ms-enum']['modelAsString'] = false;
+    reason: Handle breaking change.
 ```

From b5560b74734bc5e645f44d7dc9be2fb52754325b Mon Sep 17 00:00:00 2001
From: Qiaoqiao Zhang <55688292+qiaozha@users.noreply.github.com>
Date: Thu, 7 Aug 2025 20:29:26 +0800
Subject: [PATCH 32/34] refactor(edgeorder): migrate to unified folder
 structure (#36171)

* refactor(edgeorder): migrate to unified folder structure

- Consolidate TypeSpec and Swagger files under resource-manager/Microsoft.EdgeOrder/EdgeOrder/
- Move TypeSpec files from EdgeOrder.Management/ to new unified structure
- Relocate all swagger files and examples to service directory
- Update tspconfig.yaml with correct paths and ARM types directory
- Fix all common-types references for new folder depth
- Update readme.md input-file paths for consolidated structure
- Add suppressions.yaml for legacy API versions not yet migrated to TypeSpec
- Ensure TypeSpec compilation works correctly in new structure

This migration aligns with Azure folder structure guidelines where TypeSpec
and swagger files are unified under a single service directory.

* tsp compile
---
 .../EdgeOrder}/AddressResource.tsp            |   0
 .../EdgeOrder}/OrderItemResource.tsp          |   0
 .../EdgeOrder}/OrderResource.tsp              |   0
 .../EdgeOrder}/back-compatible.tsp            |   0
 .../examples/2024-02-01/CancelOrderItem.json  |   0
 .../examples/2024-02-01/CreateAddress.json    |   0
 .../examples/2024-02-01/CreateOrderItem.json  |   0
 .../2024-02-01/DeleteAddressByName.json       |   0
 .../2024-02-01/DeleteOrderItemByName.json     |   0
 .../examples/2024-02-01/GetAddressByName.json |   0
 .../examples/2024-02-01/GetOrderByName.json   |   0
 .../2024-02-01/GetOrderItemByName.json        |   0
 .../ListAddressesAtResourceGroupLevel.json    |   0
 .../ListAddressesAtSubscriptionLevel.json     |   0
 .../2024-02-01/ListConfigurations.json        |   0
 .../examples/2024-02-01/ListOperations.json   |   0
 .../ListOrderAtResourceGroupLevel.json        |   0
 .../ListOrderAtSubscriptionLevel.json         |   0
 .../ListOrderItemsAtResourceGroupLevel.json   |   0
 .../ListOrderItemsAtSubscriptionLevel.json    |   0
 .../2024-02-01/ListProductFamilies.json       |   0
 .../ListProductFamiliesMetadata.json          |   0
 .../examples/2024-02-01/ReturnOrderItem.json  |   0
 .../examples/2024-02-01/UpdateAddress.json    |   0
 .../examples/2024-02-01/UpdateOrderItem.json  |   0
 .../Microsoft.EdgeOrder/EdgeOrder}/main.tsp   |   0
 .../Microsoft.EdgeOrder/EdgeOrder}/models.tsp |   0
 .../preview/2020-12-01-preview/edgeorder.json | 170 +++++++++---------
 .../examples/CancelOrderItem.json             |   0
 .../examples/CreateAddress.json               |   0
 .../examples/CreateOrderItem.json             |   0
 .../examples/DeleteAddressByName.json         |   0
 .../examples/DeleteOrderItemByName.json       |   0
 .../examples/GetAddressByName.json            |   0
 .../examples/GetOrderByName.json              |   0
 .../examples/GetOrderItemByName.json          |   0
 .../ListAddressesAtResourceGroupLevel.json    |   0
 .../ListAddressesAtSubscriptionLevel.json     |   0
 .../examples/ListConfigurations.json          |   0
 .../examples/ListOperations.json              |   0
 .../ListOrderAtResourceGroupLevel.json        |   0
 .../ListOrderAtSubscriptionLevel.json         |   0
 .../ListOrderItemsAtResourceGroupLevel.json   |   0
 .../ListOrderItemsAtSubscriptionLevel.json    |   0
 .../examples/ListProductFamilies.json         |   0
 .../examples/ListProductFamiliesMetadata.json |   0
 .../examples/ReturnOrderItem.json             |   0
 .../examples/UpdateAddress.json               |   0
 .../examples/UpdateOrderItem.json             |   0
 .../preview/2022-05-01-preview/edgeorder.json | 170 +++++++++---------
 .../examples/CancelOrderItem.json             |   0
 .../examples/CreateAddress.json               |   0
 .../examples/CreateOrderItem.json             |   0
 .../examples/DeleteAddressByName.json         |   0
 .../examples/DeleteOrderItemByName.json       |   0
 .../examples/GetAddressByName.json            |   0
 .../examples/GetOrderByName.json              |   0
 .../examples/GetOrderItemByName.json          |   0
 .../ListAddressesAtResourceGroupLevel.json    |   0
 .../ListAddressesAtSubscriptionLevel.json     |   0
 .../examples/ListConfigurations.json          |   0
 .../examples/ListOperations.json              |   0
 .../ListOrderAtResourceGroupLevel.json        |   0
 .../ListOrderAtSubscriptionLevel.json         |   0
 .../ListOrderItemsAtResourceGroupLevel.json   |   0
 .../ListOrderItemsAtSubscriptionLevel.json    |   0
 .../examples/ListProductFamilies.json         |   0
 .../examples/ListProductFamiliesMetadata.json |   0
 .../examples/ReturnOrderItem.json             |   0
 .../examples/UpdateAddress.json               |   0
 .../examples/UpdateOrderItem.json             |   0
 .../EdgeOrder}/readme.az.md                   |   0
 .../EdgeOrder}/readme.go.md                   |   0
 .../EdgeOrder}/readme.md                      |   8 +-
 .../EdgeOrder}/readme.python.md               |   0
 .../Microsoft.EdgeOrder/EdgeOrder}/routes.tsp |   0
 .../stable/2021-12-01/edgeorder.json          | 170 +++++++++---------
 .../2021-12-01/examples/CancelOrderItem.json  |   0
 .../2021-12-01/examples/CreateAddress.json    |   0
 .../2021-12-01/examples/CreateOrderItem.json  |   0
 .../examples/DeleteAddressByName.json         |   0
 .../examples/DeleteOrderItemByName.json       |   0
 .../2021-12-01/examples/GetAddressByName.json |   0
 .../2021-12-01/examples/GetOrderByName.json   |   0
 .../examples/GetOrderItemByName.json          |   0
 .../ListAddressesAtResourceGroupLevel.json    |   0
 .../ListAddressesAtSubscriptionLevel.json     |   0
 .../examples/ListConfigurations.json          |   0
 .../2021-12-01/examples/ListOperations.json   |   0
 .../ListOrderAtResourceGroupLevel.json        |   0
 .../ListOrderAtSubscriptionLevel.json         |   0
 .../ListOrderItemsAtResourceGroupLevel.json   |   0
 .../ListOrderItemsAtSubscriptionLevel.json    |   0
 .../examples/ListProductFamilies.json         |   0
 .../examples/ListProductFamiliesMetadata.json |   0
 .../2021-12-01/examples/ReturnOrderItem.json  |   0
 .../2021-12-01/examples/UpdateAddress.json    |   0
 .../2021-12-01/examples/UpdateOrderItem.json  |   0
 .../stable/2024-02-01/edgeorder.json          | 166 ++++++++---------
 .../2024-02-01/examples/CancelOrderItem.json  |   0
 .../2024-02-01/examples/CreateAddress.json    |   0
 .../2024-02-01/examples/CreateOrderItem.json  |   0
 .../examples/DeleteAddressByName.json         |   0
 .../examples/DeleteOrderItemByName.json       |   0
 .../2024-02-01/examples/GetAddressByName.json |   0
 .../2024-02-01/examples/GetOrderByName.json   |   0
 .../examples/GetOrderItemByName.json          |   0
 .../ListAddressesAtResourceGroupLevel.json    |   0
 .../ListAddressesAtSubscriptionLevel.json     |   0
 .../examples/ListConfigurations.json          |   0
 .../2024-02-01/examples/ListOperations.json   |   0
 .../ListOrderAtResourceGroupLevel.json        |   0
 .../ListOrderAtSubscriptionLevel.json         |   0
 .../ListOrderItemsAtResourceGroupLevel.json   |   0
 .../ListOrderItemsAtSubscriptionLevel.json    |   0
 .../examples/ListProductFamilies.json         |   0
 .../examples/ListProductFamiliesMetadata.json |   0
 .../2024-02-01/examples/ReturnOrderItem.json  |   0
 .../2024-02-01/examples/UpdateAddress.json    |   0
 .../2024-02-01/examples/UpdateOrderItem.json  |   0
 .../EdgeOrder/suppressions.yaml               |   9 +
 .../EdgeOrder}/tspconfig.yaml                 |   5 +-
 122 files changed, 354 insertions(+), 344 deletions(-)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/AddressResource.tsp (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/OrderItemResource.tsp (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/OrderResource.tsp (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/back-compatible.tsp (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/CancelOrderItem.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/CreateAddress.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/CreateOrderItem.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/DeleteAddressByName.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/DeleteOrderItemByName.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/GetAddressByName.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/GetOrderByName.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/GetOrderItemByName.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListAddressesAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListAddressesAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListConfigurations.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListOperations.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListOrderAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListOrderAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListOrderItemsAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListOrderItemsAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListProductFamilies.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ListProductFamiliesMetadata.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/ReturnOrderItem.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/UpdateAddress.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/examples/2024-02-01/UpdateOrderItem.json (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/main.tsp (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/models.tsp (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/edgeorder.json (90%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/CancelOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/CreateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/CreateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/DeleteAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/GetAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/GetOrderByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/GetOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListConfigurations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListOperations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListProductFamilies.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/ReturnOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/UpdateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2020-12-01-preview/examples/UpdateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/edgeorder.json (91%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/CancelOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/CreateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/CreateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/DeleteAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/DeleteOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/GetAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/GetOrderByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/GetOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListAddressesAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListAddressesAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListConfigurations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListOperations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListOrderAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListOrderAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListProductFamilies.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ListProductFamiliesMetadata.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/ReturnOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/UpdateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/preview/2022-05-01-preview/examples/UpdateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/{ => Microsoft.EdgeOrder/EdgeOrder}/readme.az.md (100%)
 rename specification/edgeorder/resource-manager/{ => Microsoft.EdgeOrder/EdgeOrder}/readme.go.md (100%)
 rename specification/edgeorder/resource-manager/{ => Microsoft.EdgeOrder/EdgeOrder}/readme.md (87%)
 rename specification/edgeorder/resource-manager/{ => Microsoft.EdgeOrder/EdgeOrder}/readme.python.md (100%)
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/routes.tsp (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/edgeorder.json (90%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/CancelOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/CreateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/CreateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/DeleteAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/DeleteOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/GetAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/GetOrderByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/GetOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListAddressesAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListAddressesAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListConfigurations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListOperations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListOrderAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListOrderAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListOrderItemsAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListOrderItemsAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListProductFamilies.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ListProductFamiliesMetadata.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/ReturnOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/UpdateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2021-12-01/examples/UpdateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/edgeorder.json (92%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/CancelOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/CreateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/CreateOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/DeleteAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/DeleteOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/GetAddressByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/GetOrderByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/GetOrderItemByName.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListAddressesAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListAddressesAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListConfigurations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListOperations.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListOrderAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListOrderAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListOrderItemsAtResourceGroupLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListOrderItemsAtSubscriptionLevel.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListProductFamilies.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ListProductFamiliesMetadata.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/ReturnOrderItem.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/UpdateAddress.json (100%)
 rename specification/edgeorder/resource-manager/Microsoft.EdgeOrder/{ => EdgeOrder}/stable/2024-02-01/examples/UpdateOrderItem.json (100%)
 create mode 100644 specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/suppressions.yaml
 rename specification/edgeorder/{EdgeOrder.Management => resource-manager/Microsoft.EdgeOrder/EdgeOrder}/tspconfig.yaml (89%)

diff --git a/specification/edgeorder/EdgeOrder.Management/AddressResource.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/AddressResource.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/AddressResource.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/AddressResource.tsp
diff --git a/specification/edgeorder/EdgeOrder.Management/OrderItemResource.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/OrderItemResource.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/OrderItemResource.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/OrderItemResource.tsp
diff --git a/specification/edgeorder/EdgeOrder.Management/OrderResource.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/OrderResource.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/OrderResource.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/OrderResource.tsp
diff --git a/specification/edgeorder/EdgeOrder.Management/back-compatible.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/back-compatible.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/back-compatible.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/back-compatible.tsp
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/CancelOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/CancelOrderItem.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/CancelOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/CancelOrderItem.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/CreateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/CreateAddress.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/CreateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/CreateAddress.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/CreateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/CreateOrderItem.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/CreateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/CreateOrderItem.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/DeleteAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/DeleteAddressByName.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/DeleteAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/DeleteAddressByName.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/DeleteOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/DeleteOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/DeleteOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/DeleteOrderItemByName.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/GetAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/GetAddressByName.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/GetAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/GetAddressByName.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/GetOrderByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/GetOrderByName.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/GetOrderByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/GetOrderByName.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/GetOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/GetOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/GetOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/GetOrderItemByName.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListAddressesAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListAddressesAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListAddressesAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListAddressesAtResourceGroupLevel.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListAddressesAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListAddressesAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListAddressesAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListAddressesAtSubscriptionLevel.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListConfigurations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListConfigurations.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListConfigurations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListConfigurations.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOperations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOperations.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOperations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOperations.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderAtResourceGroupLevel.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderAtSubscriptionLevel.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderItemsAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderItemsAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderItemsAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderItemsAtResourceGroupLevel.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderItemsAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderItemsAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListOrderItemsAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListOrderItemsAtSubscriptionLevel.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListProductFamilies.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListProductFamilies.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListProductFamilies.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListProductFamilies.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListProductFamiliesMetadata.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListProductFamiliesMetadata.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ListProductFamiliesMetadata.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ListProductFamiliesMetadata.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ReturnOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ReturnOrderItem.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/ReturnOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/ReturnOrderItem.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/UpdateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/UpdateAddress.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/UpdateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/UpdateAddress.json
diff --git a/specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/UpdateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/UpdateOrderItem.json
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/examples/2024-02-01/UpdateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/examples/2024-02-01/UpdateOrderItem.json
diff --git a/specification/edgeorder/EdgeOrder.Management/main.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/main.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/main.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/main.tsp
diff --git a/specification/edgeorder/EdgeOrder.Management/models.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/models.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/models.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/models.tsp
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/edgeorder.json
similarity index 90%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/edgeorder.json
index 6571d677e5c9..eefd91844ef3 100644
--- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/edgeorder.json
@@ -30,20 +30,20 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
             }
           },
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -72,10 +72,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -102,7 +102,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -131,10 +131,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$expand",
@@ -170,7 +170,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -199,10 +199,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -231,7 +231,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -260,10 +260,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -283,7 +283,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -312,10 +312,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -335,7 +335,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -364,10 +364,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -401,7 +401,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -430,13 +430,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -463,7 +463,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -495,13 +495,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -514,7 +514,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -541,13 +541,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "addressResource",
@@ -572,7 +572,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -600,13 +600,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -622,7 +622,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -650,13 +650,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "If-Match",
@@ -688,7 +688,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -715,13 +715,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -741,7 +741,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -773,16 +773,16 @@
             "$ref": "#/parameters/orderNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -795,7 +795,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -821,13 +821,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -861,7 +861,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -893,13 +893,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$expand",
@@ -919,7 +919,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -946,13 +946,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "orderItemResource",
@@ -977,7 +977,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1005,13 +1005,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -1027,7 +1027,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1055,13 +1055,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "If-Match",
@@ -1093,7 +1093,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1123,13 +1123,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "cancellationReason",
@@ -1151,7 +1151,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1180,13 +1180,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "returnOrderItemDetails",
@@ -1208,7 +1208,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1265,7 +1265,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1275,7 +1275,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time",
           "readOnly": true
         }
@@ -2247,7 +2247,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -2257,7 +2257,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time",
           "readOnly": true
         }
@@ -2456,7 +2456,7 @@
           "readOnly": true
         },
         "error": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail",
           "description": "Top level error for the job.",
           "readOnly": true
         }
@@ -2499,7 +2499,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -2509,7 +2509,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time",
           "readOnly": true
         }
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/CancelOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/CreateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/CreateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/DeleteAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/DeleteOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/GetAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/GetOrderByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/GetOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListAddressesAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListConfigurations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOperations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamilies.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ListProductFamiliesMetadata.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ReturnOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ReturnOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/ReturnOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/ReturnOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/UpdateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2020-12-01-preview/examples/UpdateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/edgeorder.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/edgeorder.json
similarity index 91%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/edgeorder.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/edgeorder.json
index e2b57d2af467..476060676316 100644
--- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/edgeorder.json
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/edgeorder.json
@@ -30,20 +30,20 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
           "200": {
             "description": "The supported operations list.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
             }
           },
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -72,10 +72,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -110,7 +110,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -139,10 +139,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -171,7 +171,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -200,10 +200,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$expand",
@@ -239,7 +239,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -268,10 +268,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -313,7 +313,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -342,10 +342,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -373,7 +373,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -402,10 +402,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -425,7 +425,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -454,13 +454,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -495,7 +495,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -524,16 +524,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -546,7 +546,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -570,16 +570,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "addressResource",
@@ -604,7 +604,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -629,16 +629,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -660,7 +660,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -685,16 +685,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "If-Match",
@@ -732,7 +732,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -759,19 +759,19 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter"
           },
           {
             "$ref": "#/parameters/orderNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -784,7 +784,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -810,13 +810,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -858,7 +858,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -887,16 +887,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$expand",
@@ -916,7 +916,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -940,16 +940,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "orderItemResource",
@@ -974,7 +974,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -999,16 +999,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -1030,7 +1030,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1055,16 +1055,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "If-Match",
@@ -1102,7 +1102,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1129,16 +1129,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "cancellationReason",
@@ -1160,7 +1160,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1186,16 +1186,16 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "returnOrderItemDetails",
@@ -1223,7 +1223,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1250,13 +1250,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -1284,7 +1284,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1390,7 +1390,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1400,7 +1400,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time.",
           "readOnly": true
         }
@@ -2963,7 +2963,7 @@
           "x-ms-identifiers": []
         },
         "error": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail",
           "description": "Top level error for the job.",
           "readOnly": true
         }
@@ -3006,7 +3006,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -3016,7 +3016,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time.",
           "readOnly": true
         }
@@ -3142,7 +3142,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -3152,7 +3152,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time.",
           "readOnly": true
         }
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/CancelOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/CancelOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/CancelOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/CancelOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/CreateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/CreateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/CreateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/CreateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/CreateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/CreateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/CreateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/CreateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/DeleteAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/DeleteAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/DeleteAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/DeleteAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/DeleteOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/DeleteOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/DeleteOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/DeleteOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/GetAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/GetAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/GetAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/GetAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/GetOrderByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/GetOrderByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/GetOrderByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/GetOrderByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/GetOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/GetOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/GetOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/GetOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListAddressesAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListConfigurations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListConfigurations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListConfigurations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListConfigurations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOperations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOperations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOperations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOperations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListOrderItemsAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamilies.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamilies.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamilies.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamilies.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamiliesMetadata.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamiliesMetadata.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamiliesMetadata.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ListProductFamiliesMetadata.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ReturnOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ReturnOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/ReturnOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/ReturnOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/UpdateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/UpdateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/UpdateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/UpdateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/UpdateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/UpdateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/preview/2022-05-01-preview/examples/UpdateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/preview/2022-05-01-preview/examples/UpdateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/readme.az.md b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.az.md
similarity index 100%
rename from specification/edgeorder/resource-manager/readme.az.md
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.az.md
diff --git a/specification/edgeorder/resource-manager/readme.go.md b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.go.md
similarity index 100%
rename from specification/edgeorder/resource-manager/readme.go.md
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.go.md
diff --git a/specification/edgeorder/resource-manager/readme.md b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.md
similarity index 87%
rename from specification/edgeorder/resource-manager/readme.md
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.md
index ba6edfdad611..8e538cdc2a62 100644
--- a/specification/edgeorder/resource-manager/readme.md
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.md
@@ -38,7 +38,7 @@ These settings apply only when `--tag=package-2024-02` is specified on the comma
 
 ```yaml $(tag) == 'package-2024-02'
 input-file:
-  - Microsoft.EdgeOrder/stable/2024-02-01/edgeorder.json
+  - stable/2024-02-01/edgeorder.json
 ```
 ### Tag: package-2022-05-preview
 
@@ -46,7 +46,7 @@ These settings apply only when `--tag=package-2022-05-preview` is specified on t
 
 ``` yaml $(tag) == 'package-2022-05-preview'
 input-file:
-- Microsoft.EdgeOrder/preview/2022-05-01-preview/edgeorder.json
+- preview/2022-05-01-preview/edgeorder.json
 ```
 
 ---
@@ -57,7 +57,7 @@ These settings apply only when `--tag=package-2021-12` is specified on the comma
 
 ``` yaml $(tag) == 'package-2021-12'
 input-file:
-- Microsoft.EdgeOrder/stable/2021-12-01/edgeorder.json
+- stable/2021-12-01/edgeorder.json
 ```
 
 ---
@@ -68,7 +68,7 @@ These settings apply only when `--tag=package-2020-12-preview` is specified on t
 
 ``` yaml $(tag) == 'package-2020-12-preview'
 input-file:
-- Microsoft.EdgeOrder/preview/2020-12-01-preview/edgeorder.json
+- preview/2020-12-01-preview/edgeorder.json
 ```
 
 ---
diff --git a/specification/edgeorder/resource-manager/readme.python.md b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.python.md
similarity index 100%
rename from specification/edgeorder/resource-manager/readme.python.md
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/readme.python.md
diff --git a/specification/edgeorder/EdgeOrder.Management/routes.tsp b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/routes.tsp
similarity index 100%
rename from specification/edgeorder/EdgeOrder.Management/routes.tsp
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/routes.tsp
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/edgeorder.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/edgeorder.json
similarity index 90%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/edgeorder.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/edgeorder.json
index a4c097c8a5d3..166b97129952 100644
--- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/edgeorder.json
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/edgeorder.json
@@ -30,20 +30,20 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
           "200": {
             "description": "Success",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult"
             }
           },
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -72,10 +72,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -102,7 +102,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -131,10 +131,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$expand",
@@ -170,7 +170,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -199,10 +199,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -231,7 +231,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -260,10 +260,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -283,7 +283,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -312,10 +312,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -335,7 +335,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -364,10 +364,10 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -401,7 +401,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -430,13 +430,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -463,7 +463,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -495,13 +495,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -514,7 +514,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -541,13 +541,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "addressResource",
@@ -572,7 +572,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -600,13 +600,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -622,7 +622,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -650,13 +650,13 @@
             "$ref": "#/parameters/addressNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "If-Match",
@@ -688,7 +688,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -715,13 +715,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$skipToken",
@@ -741,7 +741,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -773,16 +773,16 @@
             "$ref": "#/parameters/orderNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/LocationParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -795,7 +795,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -821,13 +821,13 @@
         ],
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$filter",
@@ -861,7 +861,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -893,13 +893,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "$expand",
@@ -919,7 +919,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -946,13 +946,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "orderItemResource",
@@ -977,7 +977,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1005,13 +1005,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
@@ -1027,7 +1027,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1055,13 +1055,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "If-Match",
@@ -1093,7 +1093,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1123,13 +1123,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "cancellationReason",
@@ -1151,7 +1151,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1180,13 +1180,13 @@
             "$ref": "#/parameters/orderItemNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
           },
           {
             "name": "returnOrderItemDetails",
@@ -1208,7 +1208,7 @@
           "default": {
             "description": "Error response describing reason for operation failure.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1293,7 +1293,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1303,7 +1303,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time",
           "readOnly": true
         }
@@ -2275,7 +2275,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -2285,7 +2285,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time",
           "readOnly": true
         }
@@ -2484,7 +2484,7 @@
           "readOnly": true
         },
         "error": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail",
           "description": "Top level error for the job.",
           "readOnly": true
         }
@@ -2527,7 +2527,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -2537,7 +2537,7 @@
           "x-ms-client-flatten": true
         },
         "systemData": {
-          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
           "description": "Represents resource creation and update time",
           "readOnly": true
         }
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/CancelOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/CancelOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/CancelOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/CancelOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/CreateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/CreateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/CreateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/CreateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/CreateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/CreateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/CreateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/CreateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/DeleteAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/DeleteAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/DeleteAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/DeleteAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/DeleteOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/DeleteOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/DeleteOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/DeleteOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/GetAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/GetAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/GetAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/GetAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/GetOrderByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/GetOrderByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/GetOrderByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/GetOrderByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/GetOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/GetOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/GetOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/GetOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListAddressesAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListAddressesAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListAddressesAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListAddressesAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListAddressesAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListAddressesAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListAddressesAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListAddressesAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListConfigurations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListConfigurations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListConfigurations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListConfigurations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOperations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOperations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOperations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOperations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListOrderItemsAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListProductFamilies.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListProductFamilies.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListProductFamilies.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListProductFamilies.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListProductFamiliesMetadata.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListProductFamiliesMetadata.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ListProductFamiliesMetadata.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ListProductFamiliesMetadata.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ReturnOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ReturnOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/ReturnOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/ReturnOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/UpdateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/UpdateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/UpdateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/UpdateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/UpdateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/UpdateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2021-12-01/examples/UpdateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2021-12-01/examples/UpdateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/edgeorder.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/edgeorder.json
similarity index 92%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/edgeorder.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/edgeorder.json
index 7ba4a52627a7..31c474b6e596 100644
--- a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/edgeorder.json
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/edgeorder.json
@@ -62,20 +62,20 @@
         "description": "List the operations for the provider",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           }
         ],
         "responses": {
           "200": {
             "description": "Azure operation completed successfully.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/OperationListResult"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/OperationListResult"
             }
           },
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -98,10 +98,10 @@
         "description": "List all the addresses available under the subscription.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
             "name": "$filter",
@@ -136,7 +136,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -156,10 +156,10 @@
         "description": "List configurations for the given product family, product line and product for the given subscription.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
             "name": "$skipToken",
@@ -188,7 +188,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -208,10 +208,10 @@
         "description": "List product families for the given subscription.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
             "name": "$expand",
@@ -247,7 +247,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -270,10 +270,10 @@
         "description": "List order items at subscription level.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
             "name": "$filter",
@@ -315,7 +315,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -335,10 +335,10 @@
         "description": "List orders at subscription level.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
             "name": "$skipToken",
@@ -366,7 +366,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -386,10 +386,10 @@
         "description": "List product families metadata for the given subscription.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
             "name": "$skipToken",
@@ -409,7 +409,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -432,13 +432,13 @@
         "description": "List all the addresses available under the given resource group.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "$filter",
@@ -473,7 +473,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -496,13 +496,13 @@
         "description": "Get information about the specified address.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "addressName",
@@ -525,7 +525,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -543,13 +543,13 @@
         "description": "Create a new address with the specified parameters. Existing address cannot be updated with this API and should\ninstead be updated with the Update address API.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "addressName",
@@ -595,7 +595,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -617,13 +617,13 @@
         "description": "Update the properties of an existing address.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "addressName",
@@ -676,7 +676,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -698,13 +698,13 @@
         "description": "Delete an address.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "addressName",
@@ -738,7 +738,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -762,16 +762,16 @@
         "description": "Get an order.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/LocationParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/LocationParameter"
           },
           {
             "name": "orderName",
@@ -791,7 +791,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -811,13 +811,13 @@
         "description": "List order items at resource group level.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "$filter",
@@ -859,7 +859,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -882,13 +882,13 @@
         "description": "Get an order item.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "orderItemName",
@@ -918,7 +918,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -936,13 +936,13 @@
         "description": "Create an order item. Existing order item cannot be updated with this api and should instead be updated with the Update order item\nAPI.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "orderItemName",
@@ -988,7 +988,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1010,13 +1010,13 @@
         "description": "Update the properties of an existing order item.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "orderItemName",
@@ -1069,7 +1069,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1091,13 +1091,13 @@
         "description": "Delete an order item.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "orderItemName",
@@ -1131,7 +1131,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1155,13 +1155,13 @@
         "description": "Cancel order item.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "orderItemName",
@@ -1193,7 +1193,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1213,13 +1213,13 @@
         "description": "Return order item.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "orderItemName",
@@ -1262,7 +1262,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1283,13 +1283,13 @@
         "description": "List orders at resource group level.",
         "parameters": [
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter"
           },
           {
-            "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
+            "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter"
           },
           {
             "name": "$skipToken",
@@ -1317,7 +1317,7 @@
           "default": {
             "description": "An unexpected error response.",
             "schema": {
-              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+              "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
             }
           }
         },
@@ -1469,7 +1469,7 @@
       ],
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ]
     },
@@ -3107,7 +3107,7 @@
           "x-ms-identifiers": []
         },
         "error": {
-          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorDetail",
+          "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorDetail",
           "description": "Top level error for the job.",
           "readOnly": true
         }
@@ -3183,7 +3183,7 @@
       ],
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ]
     },
@@ -3388,7 +3388,7 @@
       ],
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ]
     },
@@ -3876,7 +3876,7 @@
           "type": "object",
           "description": "User Assigned Identities",
           "additionalProperties": {
-            "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/UserAssignedIdentity",
+            "$ref": "../../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/UserAssignedIdentity",
             "x-nullable": true
           }
         }
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/CancelOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/CancelOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/CancelOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/CancelOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/CreateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/CreateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/CreateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/CreateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/CreateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/CreateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/CreateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/CreateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/DeleteAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/DeleteAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/DeleteAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/DeleteAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/DeleteOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/DeleteOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/DeleteOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/DeleteOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/GetAddressByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/GetAddressByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/GetAddressByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/GetAddressByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/GetOrderByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/GetOrderByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/GetOrderByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/GetOrderByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/GetOrderItemByName.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/GetOrderItemByName.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/GetOrderItemByName.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/GetOrderItemByName.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListAddressesAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListAddressesAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListAddressesAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListAddressesAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListAddressesAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListAddressesAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListAddressesAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListAddressesAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListConfigurations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListConfigurations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListConfigurations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListConfigurations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOperations.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOperations.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOperations.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOperations.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtResourceGroupLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtResourceGroupLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtResourceGroupLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtResourceGroupLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtSubscriptionLevel.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtSubscriptionLevel.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtSubscriptionLevel.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListOrderItemsAtSubscriptionLevel.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListProductFamilies.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListProductFamilies.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListProductFamilies.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListProductFamilies.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListProductFamiliesMetadata.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListProductFamiliesMetadata.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ListProductFamiliesMetadata.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ListProductFamiliesMetadata.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ReturnOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ReturnOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/ReturnOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/ReturnOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/UpdateAddress.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/UpdateAddress.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/UpdateAddress.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/UpdateAddress.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/UpdateOrderItem.json b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/UpdateOrderItem.json
similarity index 100%
rename from specification/edgeorder/resource-manager/Microsoft.EdgeOrder/stable/2024-02-01/examples/UpdateOrderItem.json
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/stable/2024-02-01/examples/UpdateOrderItem.json
diff --git a/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/suppressions.yaml b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/suppressions.yaml
new file mode 100644
index 000000000000..7f2d32de2569
--- /dev/null
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/suppressions.yaml
@@ -0,0 +1,9 @@
+- tool: TypeSpecRequirement
+  path: ./preview/2020-12-01-preview/*.json
+  reason: Brownfield service not ready to migrate
+- tool: TypeSpecRequirement
+  path: ./preview/2022-05-01-preview/*.json
+  reason: Brownfield service not ready to migrate
+- tool: TypeSpecRequirement
+  path: ./stable/2021-12-01/*.json
+  reason: Brownfield service not ready to migrate
diff --git a/specification/edgeorder/EdgeOrder.Management/tspconfig.yaml b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/tspconfig.yaml
similarity index 89%
rename from specification/edgeorder/EdgeOrder.Management/tspconfig.yaml
rename to specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/tspconfig.yaml
index 5e36ddd8e8c0..cd3eae3e8cdc 100644
--- a/specification/edgeorder/EdgeOrder.Management/tspconfig.yaml
+++ b/specification/edgeorder/resource-manager/Microsoft.EdgeOrder/EdgeOrder/tspconfig.yaml
@@ -7,9 +7,10 @@ options:
   "@azure-tools/typespec-autorest":
     use-read-only-status-schema: true
     omit-unreachable-types: true
-    emitter-output-dir: "{project-root}/.."
+    emitter-output-dir: "{project-root}"
+    output-file: "{version-status}/{version}/edgeorder.json"
     azure-resource-provider-folder: "resource-manager"
-    output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/edgeorder.json"
+    arm-types-dir: "{project-root}/../../../../common-types/resource-management"
     examples-dir: "{project-root}/examples"
   "@azure-tools/typespec-csharp":
     flavor: azure

From 909912042210573ed4e7ed3fcf3b68aa9a1cc5d3 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Thu, 7 Aug 2025 09:15:08 -0700
Subject: [PATCH 33/34] Exclude "Automated merging requirements met" when
 getting list of required checks (#36513)

---
 .github/workflows/src/summarize-checks/summarize-checks.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/src/summarize-checks/summarize-checks.js b/.github/workflows/src/summarize-checks/summarize-checks.js
index afa683e03d63..994323e236c3 100644
--- a/.github/workflows/src/summarize-checks/summarize-checks.js
+++ b/.github/workflows/src/summarize-checks/summarize-checks.js
@@ -785,7 +785,12 @@ export async function getCheckRunTuple(
     });
 
     if (branchRules) {
-      requiredCheckNames = getRequiredChecksFromBranchRuleOutput(branchRules);
+      requiredCheckNames = getRequiredChecksFromBranchRuleOutput(branchRules).filter(
+        // "Automated merging requirements met" may be required in repo settings, to ensure PRs cannot be merged unless
+        // it's passing.  However, it must be excluded from our list of requiredCheckNames, since it's status is set
+        // by our own workflow.  If this check isn't excluded, it creates a deadlock where it can never be set.
+        (checkName) => checkName !== AUTOMATED_CHECK_NAME,
+      );
     }
   } else {
     requiredCheckNames = ["Summarize PR Impact", "[TEST-IGNORE] Summarize PR Impact"];

From 64b80b1e74d08a0541700a8f6b3d7d9b81ba7f6c Mon Sep 17 00:00:00 2001
From: Faraz Siddiqui <124096851+FarazGIS@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:25:30 -0700
Subject: [PATCH 34/34] Delete
 specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1 directory
 (#36501)

---
 .../2.1/examples/GetMapAttributionV2.json     |  64 --
 .../preview/2.1/examples/GetMapTileV2.json    |  61 --
 .../preview/2.1/examples/GetMapTilesetV2.json |  74 ---
 .../Render/preview/2.1/render.json            | 620 ------------------
 4 files changed, 819 deletions(-)
 delete mode 100644 specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapAttributionV2.json
 delete mode 100644 specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTileV2.json
 delete mode 100644 specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTilesetV2.json
 delete mode 100644 specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/render.json

diff --git a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapAttributionV2.json b/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapAttributionV2.json
deleted file mode 100644
index d677febc417d..000000000000
--- a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapAttributionV2.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2.1",
-    "tilesetId": "microsoft.base",
-    "zoom": 6,
-    "bounds": "-122.414162,47.579490,-122.247157,47.668372",
-    "subscription-key": "[subscription-key]"
-  },
-  "responses": {
-    "200": {
-      "headers": {},
-      "body": {
-        "copyrights": [
-          "<a>&copy; 2021 TomTom</a>"
-        ]
-      }
-    },
-    "400": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "400 BadRequest",
-          "message": "Bad request: one or more parameters were incorrectly specified or are mutually exclusive."
-        }
-      }
-    },
-    "401": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "401 Unauthorized",
-          "message": "Access denied due to invalid subscription key. Make sure to provide a valid key for an active subscription."
-        }
-      }
-    },
-    "403": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "403 Forbidden",
-          "message": "Permission, capacity, or authentication issues."
-        }
-      }
-    },
-    "404": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "404 NotFound",
-          "message": "Not Found: the requested resource could not be found, but it may be available again in the future."
-        }
-      }
-    },
-    "500": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "500 InternalServerError",
-          "message": "An error occurred while processing the request. Please try again later."
-        }
-      }
-    }
-  }
-}
diff --git a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTileV2.json b/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTileV2.json
deleted file mode 100644
index 59137b0f97a9..000000000000
--- a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTileV2.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2.1",
-    "tilesetId": "microsoft.base",
-    "zoom": 6,
-    "x": 10,
-    "y": 22,
-    "subscription-key": "[subscription-key]"
-  },
-  "responses": {
-    "200": {
-      "headers": {},
-      "body": "binary string image"
-    },
-    "400": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "400 BadRequest",
-          "message": "Bad request: one or more parameters were incorrectly specified or are mutually exclusive."
-        }
-      }
-    },
-    "401": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "401 Unauthorized",
-          "message": "Access denied due to invalid subscription key. Make sure to provide a valid key for an active subscription."
-        }
-      }
-    },
-    "403": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "403 Forbidden",
-          "message": "Permission, capacity, or authentication issues."
-        }
-      }
-    },
-    "404": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "404 NotFound",
-          "message": "Not Found: the requested resource could not be found, but it may be available again in the future."
-        }
-      }
-    },
-    "500": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "500 InternalServerError",
-          "message": "An error occurred while processing the request. Please try again later."
-        }
-      }
-    }
-  }
-}
diff --git a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTilesetV2.json b/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTilesetV2.json
deleted file mode 100644
index ef4c8fe5b517..000000000000
--- a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/examples/GetMapTilesetV2.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2.1",
-    "tilesetId": "microsoft.base",
-    "subscription-key": "[subscription-key]"
-  },
-  "responses": {
-    "200": {
-      "headers": {},
-      "body": {
-        "tilejson": "2.2.0",
-        "version": "1.0.0",
-        "attribution": "<a>&copy; 2021 TomTom</a>",
-        "scheme": "xyz",
-        "tiles": [
-          "https://atlas.microsoft.com/map/tile?api-version=2.0&tilesetId={tilesetId}&zoom={zoom}&x={x}&y={y}"
-        ],
-        "minzoom": 0,
-        "maxzoom": 22,
-        "bounds": [
-          -180,
-          -90,
-          180,
-          90
-        ]
-      }
-    },
-    "400": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "400 BadRequest",
-          "message": "Bad request: one or more parameters were incorrectly specified or are mutually exclusive."
-        }
-      }
-    },
-    "401": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "401 Unauthorized",
-          "message": "Access denied due to invalid subscription key. Make sure to provide a valid key for an active subscription."
-        }
-      }
-    },
-    "403": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "403 Forbidden",
-          "message": "Permission, capacity, or authentication issues."
-        }
-      }
-    },
-    "404": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "404 NotFound",
-          "message": "Not Found: the requested resource could not be found, but it may be available again in the future."
-        }
-      }
-    },
-    "500": {
-      "headers": {},
-      "body": {
-        "error": {
-          "code": "500 InternalServerError",
-          "message": "An error occurred while processing the request. Please try again later."
-        }
-      }
-    }
-  }
-}
diff --git a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/render.json b/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/render.json
deleted file mode 100644
index daf31d40541a..000000000000
--- a/specification/maps/data-plane/Microsoft.Maps/Render/preview/2.1/render.json
+++ /dev/null
@@ -1,620 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Azure Maps Render Service",
-    "version": "2.1",
-    "description": "Azure Maps Render REST APIs"
-  },
-  "host": "atlas.microsoft.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [],
-  "produces": [
-    "application/json",
-    "application/xml"
-  ],
-  "securityDefinitions": {
-    "AADToken": {
-      "type": "oauth2",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "flow": "implicit",
-      "description": "These are the [Azure Active Directory OAuth2](https://docs.microsoft.com/azure/active-directory/develop/v1-overview) Flows. When paired with [Azure role-based access](https://docs.microsoft.com/azure/role-based-access-control/overview) control it can be used to control access to Azure Maps REST APIs. Azure role-based access controls are used to designate access to one or more Azure Maps resource account or sub-resources. Any user, group, or service principal can be granted access via a  built-in role or a custom role composed of one or more permissions to Azure Maps REST APIs.\n\nTo implement scenarios, we recommend viewing [authentication concepts](https://aka.ms/amauth). In summary, this security definition provides a solution for modeling application(s) via objects capable of access control on specific APIs and scopes.\n\n#### Notes\n* This security definition **requires** the use of the `x-ms-client-id` header to indicate which Azure Maps resource the application is requesting access to. This can be acquired from the [Maps management API](https://aka.ms/amauthdetails).\n* \nThe `Authorization URL` is specific to the Azure public cloud instance. Sovereign clouds have unique Authorization URLs and Azure Active directory configurations. \n* \nThe Azure role-based access control is configured from the [Azure management plane](https://aka.ms/amrbac) via Azure portal, PowerShell, CLI, Azure SDKs, or REST APIs.\n* \nUsage of the [Azure Maps Web SDK](https://aka.ms/amaadmc) allows for configuration based setup of an application for multiple use cases.\n* Currently, Azure Active Directory [v1.0 or v2.0](https://docs.microsoft.com/azure/active-directory/develop/azure-ad-endpoint-comparison) supports Work, School, and Guests but does not support Personal accounts.",
-      "scopes": {
-        "https://atlas.microsoft.com/.default": "https://atlas.microsoft.com/.default"
-      }
-    },
-    "SharedKey": {
-      "type": "apiKey",
-      "description": "This is a shared key that is provisioned when you [Create an Azure Maps account](https://docs.microsoft.com/azure/azure-maps/quick-demo-map-app#create-an-azure-maps-account) in the Azure portal or using PowerShell, CLI, Azure SDKs, or REST API.\n\n With this key, any application can access all REST API. In other words, this key can be used as a master key in the account that they are issued in.\n\n For publicly exposed applications, our recommendation is to use the [confidential client applications](https://docs.microsoft.com/azure/azure-maps/authentication-best-practices#confidential-client-applications) approach to access Azure Maps REST APIs so your key can be securely stored.",
-      "name": "subscription-key",
-      "in": "query"
-    },
-    "SasToken": {
-      "type": "apiKey",
-      "description": "This is a shared access signature token is created from the List SAS operation on the [Azure Maps resource](https://aka.ms/amauth) through the Azure management plane via Azure portal, PowerShell, CLI, Azure SDKs, or REST APIs.\n\n With this token, any application is authorized to access with Azure role-based access controls and fine-grain control to the expiration, rate, and region(s) of use for the particular token. In other words, the SAS Token can be used to allow applications to control access in a more secured way than the shared key.\n\n For publicly exposed applications, our recommendation is to configure a specific list of allowed origins on the [Map account resource](https://aka.ms/amauth) to limit rendering abuse and regularly renew the SAS Token.",
-      "name": "SAS Token",
-      "in": "header"
-    }
-  },
-  "security": [
-    {
-      "AADToken": [
-        "https://atlas.microsoft.com/.default"
-      ]
-    },
-    {
-      "SharedKey": []
-    },
-    {
-      "SasToken": []
-    }
-  ],
-  "responses": {
-    "400": {
-      "description": "Bad request: one or more parameters were incorrectly specified or are mutually exclusive.",
-      "schema": {
-        "$ref": "#/definitions/ODataErrorResponse"
-      }
-    },
-    "401": {
-      "description": "Access denied due to invalid subscription key or invalid Azure Active Directory bearer token.  Make sure to provide a valid key for an active Azure subscription and Maps resource.  Otherwise, verify the [WWW-Authenticate](https://tools.ietf.org/html/rfc6750#section-3.1) header for error code and description of the provided AAD bearer token.",
-      "schema": {
-        "$ref": "#/definitions/ODataErrorResponse"
-      },
-      "headers": {
-        "WWW-Authenticate": {
-          "type": "string",
-          "description": "Bearer realm=\"https://atlas.microsoft.com/\", error=\"invalid_token\", error_description=\"The access token expired\""
-        }
-      }
-    },
-    "403": {
-      "description": "Permission, capacity, or authentication issues.",
-      "schema": {
-        "$ref": "#/definitions/ODataErrorResponse"
-      }
-    },
-    "404": {
-      "description": "Not Found: the requested resource could not be found, but it may be available again in the future.",
-      "schema": {
-        "$ref": "#/definitions/ODataErrorResponse"
-      }
-    },
-    "500": {
-      "description": "An error occurred while processing the request. Please try again later.",
-      "schema": {
-        "$ref": "#/definitions/ODataErrorResponse"
-      }
-    }
-  },
-  "parameters": {
-    "ClientId": {
-      "name": "x-ms-client-id",
-      "description": "Specifies which account is intended for usage in conjunction with the Azure AD security model.  It represents a unique ID for the Azure Maps account and can be retrieved from Azure Maps management  plane Account API. To use Azure AD security in Azure Maps see the following [articles](https://aka.ms/amauthdetails) for guidance.",
-      "type": "string",
-      "in": "header",
-      "required": false,
-      "x-ms-parameter-location": "client"
-    },
-    "SubscriptionKey": {
-      "name": "subscription-key",
-      "description": "One of the Azure Maps keys provided from an Azure Map Account. Please refer to this [article](https://docs.microsoft.com/azure/azure-maps/how-to-manage-authentication) for details on how to manage authentication.",
-      "type": "string",
-      "in": "query",
-      "required": false,
-      "x-ms-parameter-location": "client"
-    },
-    "ApiVersion": {
-      "name": "api-version",
-      "description": "Version number of Azure Maps API. Current version is 2.1",
-      "type": "string",
-      "in": "query",
-      "required": true,
-      "default": "2.0",
-      "x-ms-parameter-location": "client"
-    },
-    "TilesetId_rv2": {
-      "name": "tilesetId",
-      "description": "A tileset is a collection of raster or vector data broken up into a uniform grid of square tiles at preset  zoom levels. Every tileset has a **tilesetId** to use when making requests. The **tilesetId** for tilesets created using [Azure Maps Creator](https://aka.ms/amcreator) are generated through the  [Tileset Create API](https://docs.microsoft.com/rest/api/maps-creator/tileset). The ready-to-use tilesets supplied  by Azure Maps are listed below. For example, microsoft.base.",
-      "type": "string",
-      "in": "query",
-      "required": true,
-      "enum": [
-        "microsoft.base",
-        "microsoft.base.labels",
-        "microsoft.base.hybrid",
-        "microsoft.terra.main",
-        "microsoft.base.road",
-        "microsoft.base.darkgrey",
-        "microsoft.base.labels.road",
-        "microsoft.base.hybrid.road",
-        "microsoft.imagery",
-        "microsoft.weather.radar.main",
-        "microsoft.weather.infrared.main",
-        "microsoft.dem",
-        "microsoft.dem.contours"
-      ],
-      "x-ms-enum": {
-        "name": "TilesetID",
-        "modelAsString": true,
-        "values": [
-          {
-            "value": "microsoft.base",
-            "description": "A base map is a standard map that displays roads, natural and artificial features along with the labels for those features in a vector tile.<br>\n\nSupports zoom levels 0 through 22. Format: vector (pbf)."
-          },
-          {
-            "value": "microsoft.base.labels",
-            "description": "Displays labels for roads, natural and artificial features in a vector tile.<br>\n\nSupports zoom levels 0 through 22. Format: vector (pbf)."
-          },
-          {
-            "value": "microsoft.base.hybrid",
-            "description": "Displays road, boundary and label data in a vector tile.<br>\n\nSupports zoom levels 0 through 22. Format: vector (pbf)."
-          },
-          {
-            "value": "microsoft.terra.main",
-            "description": "Shaded relief and terra layers.<br>\n\nSupports zoom levels 0 through 6. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.base.road",
-            "description": "All layers with our main style.<br>\n\nSupports zoom levels 0 through 22. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.base.darkgrey",
-            "description": "All layers with our dark grey style.<br>\n\nSupports zoom levels 0 through 22. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.base.labels.road",
-            "description": "Label data in our main style.<br>\n\nSupports zoom levels 0 through 22. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.base.hybrid.road",
-            "description": "Road, boundary and label data in our main style.<br>\n\nSupports zoom levels 0 through 22. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.imagery",
-            "description": "A combination of satellite and aerial imagery. Only available in S1 pricing SKU.<br>\n\nSupports zoom levels 1 through 19. Format: raster (jpeg)."
-          },
-          {
-            "value": "microsoft.weather.radar.main",
-            "description": "Weather radar tiles. Latest weather radar images including areas of rain, snow, ice and mixed conditions. Please see [coverage information](https://aka.ms/AzureMapsWeatherCoverage) for Azure Maps Weather service.  To learn more about the Radar data, please see [Weather concepts](https://aka.ms/AzureMapsWeatherConcepts).<br>\n\nSupports zoom levels 0 through 15. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.weather.infrared.main",
-            "description": "Weather infrared tiles. Latest Infrared Satellite images shows clouds by their temperature.  Please see [coverage information](https://aka.ms/AzureMapsWeatherCoverage) for Azure Maps Weather service. To learn more about the returned Satellite data, please see [Weather concepts](https://aka.ms/AzureMapsWeatherConcepts).<br>\n\nSupports zoom levels 0 through 15. Format: raster (png)."
-          },
-          {
-            "value": "microsoft.dem",
-            "description": "Digital Elevation Model tiles. The tiles are in the GeoTIFF format with a single 32-bit floating point band. The tiles cover the whole landmass of Earth. Some small islands (e.g., atolls) might not be represented accurately.<br>\n* The vertical unit for measurement of elevation height is meters. An elevation value of -32767.0 is used for points that have no data value, most often returned where there isn't landmass (i.e. water).<br>\n* The horizontal reference datum is the World Geodetic System 1984 (WGS84-G1150) and the vertical reference datum is the Earth Gravitational Model 2008 (EGM2008).<br>\n* Tiles are 258x258 pixel squares rather than the standard 256 x 256. This is done to allow for accurate interpolation of values at the tile edges. As such adjacent tiles overlap by 1 pixel along all edges.<br>\n* Tile data comes from the [Airbus WorldDEM4Ortho product](https://www.intelligence-airbusds.com/worlddem-streaming/). Urban areas are approximately leveled down to ground level. All other areas are represented by the object surface level (e.g., trees). <br>\n\nSupports zoom level 13 only. Format: raster (tiff)."
-          },
-          {
-            "value": "microsoft.dem.contours",
-            "description": "Digital elevation contour line tiles. Compared to the microsoft.dem option, these tiles are in vector format and intended for visualization purpose. The tiles cover the whole landmass of Earth. Some small islands (e.g., atolls) might not be represented accurately.<br>\n* The vertical unit for measurement of elevation height is meters.<br>\n* The horizontal reference datum is the World Geodetic System 1984 (WGS84-G1150) and the vertical reference datum is the Earth Gravitational Model 2008 (EGM2008).<br>\n* Tile data comes from the [Airbus WorldDEM4Ortho product](https://www.intelligence-airbusds.com/worlddem-streaming/). Urban areas are approximately leveled down to ground level. All other areas are represented by the object surface level (e.g., trees).<br>\n\nSupports zoom levels 9 through 14. Format: vector (pbf)."
-          }
-        ]
-      },
-      "x-ms-parameter-location": "method"
-    },
-    "xTileIndex": {
-      "name": "x",
-      "x-ms-client-name": "xTileIndex",
-      "in": "query",
-      "description": "X coordinate of the tile on zoom grid. Value must be in the range [0, 2<sup>`zoom`</sup> -1].\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
-      "required": true,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
-    },
-    "yTileIndex": {
-      "name": "y",
-      "x-ms-client-name": "yTileIndex",
-      "in": "query",
-      "description": "Y coordinate of the tile on zoom grid. Value must be in the range [0, 2<sup>`zoom`</sup> -1].\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
-      "required": true,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
-    },
-    "MapTileV2Zoom": {
-      "name": "zoom",
-      "in": "query",
-      "description": "Zoom level for the desired tile. Please find TilesetID list below for more details on supported zoom level for each tilesetId.<br>\n\nPlease see [Zoom Levels and Tile Grid](https://docs.microsoft.com/en-us/azure/location-based-services/zoom-levels-and-tile-grid) for details.",
-      "required": true,
-      "type": "integer",
-      "format": "int32",
-      "x-ms-parameter-location": "method"
-    },
-    "Language": {
-      "name": "language",
-      "in": "query",
-      "description": "Language in which search results should be returned. Should be one of supported IETF language tags, case insensitive. When data in specified language is not available for a specific field, default language is used.\n\nPlease refer to [Supported Languages](https://docs.microsoft.com/en-us/azure/azure-maps/supported-languages) for details.",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    },
-    "Text": {
-      "name": "text",
-      "in": "query",
-      "description": "Yes/no value to exclude textual data from response. Only images and country names will be in response.",
-      "required": false,
-      "type": "string",
-      "enum": [
-        "yes",
-        "no"
-      ],
-      "default": "yes",
-      "x-ms-parameter-location": "method"
-    },
-    "View": {
-      "name": "view",
-      "in": "query",
-      "description": "The View parameter specifies which set of geopolitically disputed content is returned via Azure Maps services, including  borders and labels displayed on the map. The View parameter (also referred to as “user region parameter”) will show the  correct maps for that country/region. By default, the View parameter is set to “Unified” even if you haven’t defined it in  the request. It is your responsibility to determine the location of your users, and then set the View parameter correctly  for that location. Alternatively, you have the option to set ‘View=Auto’, which will return the map data based on the IP  address of the request. The View parameter in Azure Maps must be used in compliance with applicable laws, including those  regarding mapping, of the country where maps, images and other data and third party content that you are authorized to  access via Azure Maps is made available. Example: view=IN.\n\nPlease refer to [Supported Views](https://aka.ms/AzureMapsLocalizationViews) for details and to see the available Views.",
-      "required": false,
-      "type": "string",
-      "x-ms-parameter-location": "method"
-    }
-  },
-  "paths": {
-    "/map/tile": {
-      "get": {
-        "description": "**Applies to**: S0 and S1 pricing tiers.\n\nThe Get Map Tiles API allows users to request map tiles in vector or raster formats typically to be integrated  into a map control or SDK. Some example tiles that can be requested are Azure Maps road tiles, real-time  Weather Radar tiles or the map tiles created using [Azure Maps Creator](https://aka.ms/amcreator). By default,  Azure Maps uses vector tiles for its web map control (Web SDK) and Android SDK.",
-        "operationId": "RenderV2_GetMapTile",
-        "x-ms-examples": {
-          "GetMapTile": {
-            "$ref": "./examples/GetMapTileV2.json"
-          }
-        },
-        "parameters": [
-          {
-            "$ref": "#/parameters/ClientId"
-          },
-          {
-            "$ref": "#/parameters/SubscriptionKey"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/TilesetId_rv2"
-          },
-          {
-            "$ref": "#/parameters/MapTileV2Zoom"
-          },
-          {
-            "$ref": "#/parameters/xTileIndex"
-          },
-          {
-            "$ref": "#/parameters/yTileIndex"
-          },
-          {
-            "name": "timeStamp",
-            "in": "query",
-            "description": "The desired date and time of the requested tile. This parameter must be specified in the standard date-time format (e.g. 2019-11-14T16:03:00-08:00), as defined by [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601). This parameter is only supported when tilesetId parameter is set to one of the values below.\n  \n* microsoft.weather.infrared.main: We provide tiles up to 3 hours in the past. Tiles are available in 10-minute intervals. We round the timeStamp value to the nearest 10-minute time frame.\n* microsoft.weather.radar.main: We provide tiles up to 1.5 hours in the past and up to 2 hours in the future. Tiles are available in 5-minute intervals. We round the timeStamp value to the nearest 5-minute time frame.",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "tileSize",
-            "in": "query",
-            "description": "The size of the returned map tile in pixels.",
-            "required": false,
-            "type": "string",
-            "default": "256",
-            "enum": [
-              "256",
-              "512"
-            ],
-            "x-ms-enum": {
-              "name": "TileSize",
-              "modelAsString": true,
-              "values": [
-                {
-                  "value": "256",
-                  "description": "Return a 256 by 256 pixel tile. Available for all tilesetIds except for\n* microsoft.terra.main"
-                },
-                {
-                  "value": "512",
-                  "description": "Return a 512 by 512 pixel tile.  Available for all tilesetIds except for \n* microsoft.weather.radar.main\n* microsoft.weather.infrared.main\n* microsoft.base.hybrid\n* microsoft.dem\n* microsoft.imagery"
-                }
-              ]
-            }
-          },
-          {
-            "$ref": "#/parameters/Language"
-          },
-          {
-            "$ref": "#/parameters/View"
-          }
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/MapTileResultv2"
-            }
-          },
-          "400": {
-            "$ref": "#/responses/400"
-          },
-          "401": {
-            "$ref": "#/responses/401"
-          },
-          "403": {
-            "$ref": "#/responses/403"
-          },
-          "404": {
-            "$ref": "#/responses/404"
-          },
-          "500": {
-            "$ref": "#/responses/500"
-          }
-        }
-      }
-    },
-    "/map/tileset": {
-      "get": {
-        "description": "**Applies to**: S0 and S1 pricing tiers.\n\nThe Get Map Tileset API allows users to request metadata for a tileset.",
-        "operationId": "RenderV2_GetMapTileset",
-        "x-ms-examples": {
-          "GetMapTile": {
-            "$ref": "./examples/GetMapTilesetV2.json"
-          }
-        },
-        "parameters": [
-          {
-            "$ref": "#/parameters/ClientId"
-          },
-          {
-            "$ref": "#/parameters/SubscriptionKey"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/TilesetId_rv2"
-          }
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/MapTilesetResultV2"
-            }
-          },
-          "400": {
-            "$ref": "#/responses/400"
-          },
-          "401": {
-            "$ref": "#/responses/401"
-          },
-          "403": {
-            "$ref": "#/responses/403"
-          },
-          "404": {
-            "$ref": "#/responses/404"
-          },
-          "500": {
-            "$ref": "#/responses/500"
-          }
-        }
-      }
-    },
-    "/map/attribution": {
-      "get": {
-        "description": "**Applies to**: S0 and S1 pricing tiers.\n\nThe Get Map Attribution API allows users to request map copyright attribution information for a section of a tileset.",
-        "operationId": "RenderV2_GetMapAttribution",
-        "x-ms-examples": {
-          "GetMapTile": {
-            "$ref": "./examples/GetMapAttributionV2.json"
-          }
-        },
-        "parameters": [
-          {
-            "$ref": "#/parameters/ClientId"
-          },
-          {
-            "$ref": "#/parameters/SubscriptionKey"
-          },
-          {
-            "$ref": "#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "#/parameters/TilesetId_rv2"
-          },
-          {
-            "$ref": "#/parameters/MapTileV2Zoom"
-          },
-          {
-            "name": "bounds",
-            "in": "query",
-            "description": "The string that represents the rectangular area of a bounding box. The bounds parameter is defined by the 4 bounding box coordinates, with WGS84 longitude and latitude of the southwest corner followed by  WGS84 longitude and latitude of the northeast corner. The string is presented in the following  format: `[SouthwestCorner_Longitude, SouthwestCorner_Latitude, NortheastCorner_Longitude,  NortheastCorner_Latitude]`.",
-            "required": true,
-            "type": "array",
-            "collectionFormat": "csv",
-            "items": {
-              "type": "string"
-            }
-          }
-        ],
-        "produces": [
-          "application/json"
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/MapAttributionResultV2"
-            }
-          },
-          "400": {
-            "$ref": "#/responses/400"
-          },
-          "401": {
-            "$ref": "#/responses/401"
-          },
-          "403": {
-            "$ref": "#/responses/403"
-          },
-          "404": {
-            "$ref": "#/responses/404"
-          },
-          "500": {
-            "$ref": "#/responses/500"
-          }
-        }
-      }
-    }
-  },
-  "definitions": {
-    "ODataErrorResponse": {
-      "type": "object",
-      "description": "This response object is returned when an error occurs in the Maps API.",
-      "properties": {
-        "error": {
-          "$ref": "#/definitions/ODataError"
-        }
-      }
-    },
-    "ODataError": {
-      "type": "object",
-      "description": "This object is returned when an error occurs in the Maps API.",
-      "properties": {
-        "code": {
-          "type": "string",
-          "readOnly": true,
-          "description": "The ODataError code."
-        },
-        "message": {
-          "type": "string",
-          "readOnly": true,
-          "description": "If available, a human readable description of the error."
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ODataError"
-          }
-        },
-        "target": {
-          "type": "string",
-          "readOnly": true,
-          "description": "If available, the target causing the error."
-        }
-      }
-    },
-    "MapTileResultv2": {
-      "description": "The tile returned from a successful API call.",
-      "type": "string",
-      "format": "binary",
-      "readOnly": true
-    },
-    "MapTilesetResultV2": {
-      "description": "Metadata for a tileset in the TileJSON format.",
-      "type": "object",
-      "readOnly": true,
-      "properties": {
-        "tilejson": {
-          "type": "string",
-          "pattern": "\\d+\\.\\d+\\.\\d+\\w?[\\w\\d]*",
-          "description": "Version of the TileJSON spec."
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the tileset."
-        },
-        "description": {
-          "type": "string",
-          "description": "Text description of the tileset."
-        },
-        "version": {
-          "type": "string",
-          "pattern": "\\d+\\.\\d+\\.\\d+\\w?[\\w\\d]*",
-          "description": "A semver.org style version number for the tiles contained within the tileset."
-        },
-        "attribution": {
-          "type": "string",
-          "description": "Copyright attribution to be displayed on the map."
-        },
-        "template": {
-          "type": "string",
-          "description": "A mustache template to be used to format data from grids for interaction."
-        },
-        "legend": {
-          "type": "string",
-          "description": "A legend to be displayed with the map."
-        },
-        "scheme": {
-          "type": "string",
-          "description": "Default: \"xyz\". Either \"xyz\" or \"tms\". Influences the y direction of the tile coordinates."
-        },
-        "tiles": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "An array of tile endpoints."
-        },
-        "grids": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "An array of interactivity endpoints."
-        },
-        "data": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "An array of data files in GeoJSON format."
-        },
-        "minzoom": {
-          "minimum": 0,
-          "maximum": 30,
-          "type": "integer",
-          "description": "The minimum zoom level."
-        },
-        "maxzoom": {
-          "minimum": 0,
-          "maximum": 30,
-          "type": "integer",
-          "description": "The maximum zoom level."
-        },
-        "bounds": {
-          "type": "array",
-          "items": {
-            "type": "number"
-          },
-          "description": "The WGS84 bounds of the tileset."
-        },
-        "center": {
-          "type": "array",
-          "items": {
-            "type": "number"
-          },
-          "description": "The default location of the tileset in the form [longitude, latitude, zoom]."
-        }
-      }
-    },
-    "MapAttributionResultV2": {
-      "description": "Copyright attribution for the requested section of a tileset.",
-      "type": "object",
-      "readOnly": true,
-      "properties": {
-        "copyrights": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "A list of copyright strings."
-        }
-      }
-    }
-  }
-}