From 44b342f66deff2980db0fead8e66d14b5b3cc109 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:27:35 +0800
Subject: [PATCH 1/2] Bump vite from 5.2.8 to 5.4.9 in
 /packages/http-client-csharp (#4728)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite)
from 5.2.8 to 5.4.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/vitejs/vite/releases">vite's
releases</a>.</em></p>
<blockquote>
<h2>create-vite@5.4.0</h2>
<p>Please refer to <a
href="https://github.com/vitejs/vite/blob/create-vite@5.4.0/packages/create-vite/CHANGELOG.md">CHANGELOG.md</a>
for details.</p>
<h2>create-vite@5.3.0</h2>
<p>Please refer to <a
href="https://github.com/vitejs/vite/blob/create-vite@5.3.0/packages/create-vite/CHANGELOG.md">CHANGELOG.md</a>
for details.</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/vitejs/vite/blob/v5.4.9/packages/vite/CHANGELOG.md">vite's
changelog</a>.</em></p>
<blockquote>
<h2><!-- raw HTML omitted -->5.4.9 (2024-10-14)<!-- raw HTML omitted
--></h2>
<ul>
<li>fix: bump launch-editor-middleware to v2.9.1 (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18348">#18348</a>)
(<a
href="https://github.com/vitejs/vite/commit/508d9ab83412c36e33f4c4ca57b891171429cdd3">508d9ab</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18348">#18348</a></li>
<li>fix(css): fix lightningcss dep url resolution with custom root (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18125">#18125</a>)
(<a
href="https://github.com/vitejs/vite/commit/eae00b561e04f1fe1679d3acf4f88b3c42019e4d">eae00b5</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18125">#18125</a></li>
<li>fix(data-uri): only match ids starting with <code>data:</code> (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18241">#18241</a>)
(<a
href="https://github.com/vitejs/vite/commit/96084d6e752c03332d101a50bce161a8e3f311cc">96084d6</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18241">#18241</a></li>
<li>fix(deps): bump tsconfck (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18322">#18322</a>)
(<a
href="https://github.com/vitejs/vite/commit/dc5434ce8781d206bcc4b55e90201691125e662c">dc5434c</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18322">#18322</a></li>
<li>fix(hmr): don't try to rewrite imports for direct CSS soft
invalidation (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18252">#18252</a>)
(<a
href="https://github.com/vitejs/vite/commit/851b258c346fdddd4467a12f41189b7855df8c43">851b258</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18252">#18252</a></li>
<li>fix(ssr): (backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18150">#18150</a>)
fix source map remapping with multiple sources (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18204">#18204</a>)
(<a
href="https://github.com/vitejs/vite/commit/262a8796d4be2c4b9c812f203ea9177f42360b13">262a879</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18204">#18204</a></li>
<li>chore: update all url references of vitejs.dev to vite.dev (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18276">#18276</a>)
(<a
href="https://github.com/vitejs/vite/commit/c23558a7af341d13f0c9da691047713965bc7e7d">c23558a</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18276">#18276</a></li>
<li>chore: update license copyright (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18278">#18278</a>)
(<a
href="https://github.com/vitejs/vite/commit/1864eb17b21ef21564bd66c6f6a30c2c495e2d4e">1864eb1</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18278">#18278</a></li>
<li>docs: update homepage (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18274">#18274</a>)
(<a
href="https://github.com/vitejs/vite/commit/ae4416349e1a373023d0e9e05955d96ae5fa9ab2">ae44163</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18274">#18274</a></li>
</ul>
<h2><!-- raw HTML omitted -->5.4.8 (2024-09-25)<!-- raw HTML omitted
--></h2>
<ul>
<li>fix(css): backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18113">#18113</a>,
fix missing source file warning with sass modern api custom importer (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18">#18</a>
(<a
href="https://github.com/vitejs/vite/commit/7d47fc1c749053095a3345ca1d47406a5f31792a">7d47fc1</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18183">#18183</a></li>
<li>fix(css): backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18128">#18128</a>,
ensure sass compiler initialized only once (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18184">#18184</a>)
(<a
href="https://github.com/vitejs/vite/commit/8464d976b1d9280ed915622c0e7477b36bdb7d8c">8464d97</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18128">#18128</a>
<a
href="https://redirect.github.com/vitejs/vite/issues/18184">#18184</a></li>
</ul>
<h2><!-- raw HTML omitted -->5.4.7 (2024-09-20)<!-- raw HTML omitted
--></h2>
<ul>
<li>fix: treat config file as ESM in Deno (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18158">#18158</a>)
(<a
href="https://github.com/vitejs/vite/commit/b5908a24ba0808380e3c8ec415624b108c65e08d">b5908a2</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18158">#18158</a></li>
</ul>
<h2><!-- raw HTML omitted -->5.4.6 (2024-09-16)<!-- raw HTML omitted
--></h2>
<ul>
<li>fix: avoid DOM Clobbering gadget in
<code>getRelativeUrlFromDocument</code> (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18115">#18115</a>)
(<a
href="https://github.com/vitejs/vite/commit/179b17773cf35c73ddb041f9e6c703fd9f3126af">179b177</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18115">#18115</a></li>
<li>fix: fs raw query (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18112">#18112</a>)
(<a
href="https://github.com/vitejs/vite/commit/6820bb3b9a54334f3268fc5ee1e967d2e1c0db34">6820bb3</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18112">#18112</a></li>
</ul>
<h2><!-- raw HTML omitted -->5.4.5 (2024-09-13)<!-- raw HTML omitted
--></h2>
<ul>
<li>fix(preload): backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18098">#18098</a>,
throw error preloading module as well (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18099">#18099</a>)
(<a
href="https://github.com/vitejs/vite/commit/faa2405e5d1da07a7c7fb6d48e887bf97a2f3dba">faa2405</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18098">#18098</a>
<a
href="https://redirect.github.com/vitejs/vite/issues/18099">#18099</a></li>
</ul>
<h2><!-- raw HTML omitted -->5.4.4 (2024-09-11)<!-- raw HTML omitted
--></h2>
<ul>
<li>fix: backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/17997">#17997</a>,
ensure req.url matches moduleByEtag URL to avoid incorrect 304 (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18078">#18078</a>)
(<a
href="https://github.com/vitejs/vite/commit/74a79c53b2286c91739d1473945012b5d206eddf">74a79c5</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/17997">#17997</a>
<a
href="https://redirect.github.com/vitejs/vite/issues/18078">#18078</a></li>
<li>fix: backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18063">#18063</a>,
allow scanning exports from <code>script module</code> in svelte (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18077">#18077</a>)
(<a
href="https://github.com/vitejs/vite/commit/d90ba40474aa1da8e722e1660ba739621238e5ac">d90ba40</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18063">#18063</a>
<a
href="https://redirect.github.com/vitejs/vite/issues/18077">#18077</a></li>
<li>fix(preload): backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18046">#18046</a>,
allow ignoring dep errors (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18076">#18076</a>)
(<a
href="https://github.com/vitejs/vite/commit/8760293d6836dac554d1d6f214b8b09ed97cccd4">8760293</a>),
closes <a
href="https://redirect.github.com/vitejs/vite/issues/18046">#18046</a>
<a
href="https://redirect.github.com/vitejs/vite/issues/18076">#18076</a></li>
</ul>
<h2><!-- raw HTML omitted -->5.4.3 (2024-09-03)<!-- raw HTML omitted
--></h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vitejs/vite/commit/898d61f94b4316993963f593644821aae221d375"><code>898d61f</code></a>
release: v5.4.9</li>
<li><a
href="https://github.com/vitejs/vite/commit/508d9ab83412c36e33f4c4ca57b891171429cdd3"><code>508d9ab</code></a>
fix: bump launch-editor-middleware to v2.9.1 (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18348">#18348</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/dc5434ce8781d206bcc4b55e90201691125e662c"><code>dc5434c</code></a>
fix(deps): bump tsconfck (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18322">#18322</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/851b258c346fdddd4467a12f41189b7855df8c43"><code>851b258</code></a>
fix(hmr): don't try to rewrite imports for direct CSS soft invalidation
(<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18252">#18252</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/96084d6e752c03332d101a50bce161a8e3f311cc"><code>96084d6</code></a>
fix(data-uri): only match ids starting with <code>data:</code> (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18241">#18241</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/eae00b561e04f1fe1679d3acf4f88b3c42019e4d"><code>eae00b5</code></a>
fix(css): fix lightningcss dep url resolution with custom root (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18125">#18125</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/c23558a7af341d13f0c9da691047713965bc7e7d"><code>c23558a</code></a>
chore: update all url references of vitejs.dev to vite.dev (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18276">#18276</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/1864eb17b21ef21564bd66c6f6a30c2c495e2d4e"><code>1864eb1</code></a>
chore: update license copyright (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18278">#18278</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/ae4416349e1a373023d0e9e05955d96ae5fa9ab2"><code>ae44163</code></a>
docs: update homepage (<a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18274">#18274</a>)</li>
<li><a
href="https://github.com/vitejs/vite/commit/262a8796d4be2c4b9c812f203ea9177f42360b13"><code>262a879</code></a>
fix(ssr): (backport <a
href="https://github.com/vitejs/vite/tree/HEAD/packages/vite/issues/18150">#18150</a>)
fix source map remapping with multiple sources (#...</li>
<li>Additional commits viewable in <a
href="https://github.com/vitejs/vite/commits/v5.4.9/packages/vite">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=vite&package-manager=npm_and_yarn&previous-version=5.2.8&new-version=5.4.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/microsoft/typespec/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/http-client-csharp/package-lock.json | 408 +++++++++---------
 1 file changed, 213 insertions(+), 195 deletions(-)

diff --git a/packages/http-client-csharp/package-lock.json b/packages/http-client-csharp/package-lock.json
index e61600755d..0c4a69a49e 100644
--- a/packages/http-client-csharp/package-lock.json
+++ b/packages/http-client-csharp/package-lock.json
@@ -797,9 +797,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
         "ppc64"
       ],
@@ -813,9 +813,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
@@ -829,9 +829,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
@@ -845,9 +845,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
@@ -861,9 +861,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
@@ -877,9 +877,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
@@ -893,9 +893,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
@@ -909,9 +909,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
@@ -925,9 +925,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
@@ -941,9 +941,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
@@ -957,9 +957,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
@@ -973,9 +973,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
@@ -989,9 +989,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
@@ -1005,9 +1005,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
@@ -1021,9 +1021,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
@@ -1037,9 +1037,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
@@ -1053,9 +1053,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
@@ -1069,9 +1069,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
@@ -1085,9 +1085,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
@@ -1101,9 +1101,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
@@ -1117,9 +1117,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
@@ -1133,9 +1133,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
@@ -1149,9 +1149,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
@@ -1505,9 +1505,9 @@
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.0.tgz",
-      "integrity": "sha512-jwXtxYbRt1V+CdQSy6Z+uZti7JF5irRKF8hlKfEnF/xJpcNGuuiZMBvuoYM+x9sr9iWGnzrlM0+9hvQ1kgkf1w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -1518,9 +1518,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.0.tgz",
-      "integrity": "sha512-fI9nduZhCccjzlsA/OuAwtFGWocxA4gqXGTLvOyiF8d+8o0fZUeSztixkYjcGq1fGZY3Tkq4yRvHPFxU+jdZ9Q==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -1531,9 +1531,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.0.tgz",
-      "integrity": "sha512-BcnSPRM76/cD2gQC+rQNGBN6GStBs2pl/FpweW8JYuz5J/IEa0Fr4AtrPv766DB/6b2MZ/AfSIOSGw3nEIP8SA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -1544,9 +1544,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.0.tgz",
-      "integrity": "sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -1557,9 +1557,22 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.0.tgz",
-      "integrity": "sha512-ygrGVhQP47mRh0AAD0zl6QqCbNsf0eTo+vgwkY6LunBcg0f2Jv365GXlDUECIyoXp1kKwL5WW6rsO429DBY/bA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -1570,9 +1583,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.0.tgz",
-      "integrity": "sha512-x+uJ6MAYRlHGe9wi4HQjxpaKHPM3d3JjqqCkeC5gpnnI6OWovLdXTpfa8trjxPLnWKyBsSi5kne+146GAxFt4A==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -1583,9 +1596,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.0.tgz",
-      "integrity": "sha512-nrRw8ZTQKg6+Lttwqo6a2VxR9tOroa2m91XbdQ2sUUzHoedXlsyvY1fN4xWdqz8PKmf4orDwejxXHjh7YBGUCA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -1596,11 +1609,11 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.0.tgz",
-      "integrity": "sha512-xV0d5jDb4aFu84XKr+lcUJ9y3qpIWhttO3Qev97z8DKLXR62LC3cXT/bMZXrjLF9X+P5oSmJTzAhqwUbY96PnA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
-        "ppc64le"
+        "ppc64"
       ],
       "dev": true,
       "optional": true,
@@ -1609,9 +1622,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.0.tgz",
-      "integrity": "sha512-SDDhBQwZX6LPRoPYjAZWyL27LbcBo7WdBFWJi5PI9RPCzU8ijzkQn7tt8NXiXRiFMJCVpkuMkBf4OxSxVMizAw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -1622,9 +1635,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.0.tgz",
-      "integrity": "sha512-RxB/qez8zIDshNJDufYlTT0ZTVut5eCpAZ3bdXDU9yTxBzui3KhbGjROK2OYTTor7alM7XBhssgoO3CZ0XD3qA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -1635,9 +1648,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.0.tgz",
-      "integrity": "sha512-C6y6z2eCNCfhZxT9u+jAM2Fup89ZjiG5pIzZIDycs1IwESviLxwkQcFRGLjnDrP+PT+v5i4YFvlcfAs+LnreXg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -1648,9 +1661,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.0.tgz",
-      "integrity": "sha512-i0QwbHYfnOMYsBEyjxcwGu5SMIi9sImDVjDg087hpzXqhBSosxkE7gyIYFHgfFl4mr7RrXksIBZ4DoLoP4FhJg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -1661,9 +1674,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.0.tgz",
-      "integrity": "sha512-Fq52EYb0riNHLBTAcL0cun+rRwyZ10S9vKzhGKKgeD+XbwunszSY0rVMco5KbOsTlwovP2rTOkiII/fQ4ih/zQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -1674,9 +1687,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.0.tgz",
-      "integrity": "sha512-e/PBHxPdJ00O9p5Ui43+vixSgVf4NlLsmV6QneGERJ3lnjIua/kim6PRFe3iDueT1rQcgSkYP8ZBBXa/h4iPvw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -1687,9 +1700,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.0.tgz",
-      "integrity": "sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -1852,9 +1865,9 @@
       "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-coverage": {
@@ -2997,9 +3010,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -3009,29 +3022,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/escalade": {
@@ -4828,6 +4841,24 @@
         "mustache": "bin/mustache"
       }
     },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -5224,9 +5255,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "dev": true,
       "funding": [
         {
@@ -5244,31 +5275,13 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/prettier": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
@@ -5557,12 +5570,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.0.tgz",
-      "integrity": "sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -5572,21 +5585,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.14.0",
-        "@rollup/rollup-android-arm64": "4.14.0",
-        "@rollup/rollup-darwin-arm64": "4.14.0",
-        "@rollup/rollup-darwin-x64": "4.14.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.14.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.14.0",
-        "@rollup/rollup-linux-arm64-musl": "4.14.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.14.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.14.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.14.0",
-        "@rollup/rollup-linux-x64-gnu": "4.14.0",
-        "@rollup/rollup-linux-x64-musl": "4.14.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.14.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.14.0",
-        "@rollup/rollup-win32-x64-msvc": "4.14.0",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -5876,9 +5890,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6396,14 +6410,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz",
-      "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==",
+      "version": "5.4.9",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
+      "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -6422,6 +6436,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -6439,6 +6454,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },

From eab50b952c67571f28f676569e4bbf27d7f30327 Mon Sep 17 00:00:00 2001
From: Xiaofei Cao <92354331+XiaofeiCao@users.noreply.github.com>
Date: Thu, 17 Oct 2024 17:29:34 +0800
Subject: [PATCH 2/2] http-client-java, bump specs and fix ARM test (#4772)

manual fix in
https://github.com/microsoft/typespec/commit/007f079e10cc73a23f8e7ea123d312cf99e565b1
---
 .../http-client-generator-test/package.json   |  2 +-
 .../CommonPropertiesManager.java}             | 69 +++++++++----------
 .../fluent/CommonPropertiesClient.java}       | 12 ++--
 .../fluent/ManagedIdentitiesClient.java}      |  8 +--
 .../ManagedIdentityTrackedResourceInner.java  |  6 +-
 .../fluent}/models/package-info.java          |  4 +-
 .../fluent}/package-info.java                 |  4 +-
 .../CommonPropertiesClientBuilder.java}       | 40 +++++------
 .../CommonPropertiesClientImpl.java}          | 32 ++++-----
 .../ManagedIdentitiesClientImpl.java}         | 36 +++++-----
 .../ManagedIdentitiesImpl.java}               | 26 +++----
 .../ManagedIdentityTrackedResourceImpl.java   | 30 ++++----
 .../implementation/ResourceManagerUtils.java  |  2 +-
 .../implementation}/package-info.java         |  4 +-
 .../models/ManagedIdentities.java}            |  6 +-
 .../ManagedIdentityTrackedResource.java       |  7 +-
 ...agedIdentityTrackedResourceProperties.java |  2 +-
 .../models/ManagedServiceIdentity.java        |  2 +-
 .../models/ManagedServiceIdentityType.java    |  2 +-
 .../models/UserAssignedIdentity.java          |  2 +-
 .../models}/package-info.java                 |  4 +-
 .../commonproperties/package-info.java        |  9 +++
 .../fluent/models/package-info.java           |  9 ---
 .../resources/ResourcesManager.java           | 64 +++++++++--------
 .../fluent/NestedsClient.java}                |  8 +--
 .../resources/fluent/ResourcesClient.java     | 20 +++---
 .../fluent/SingletonsClient.java}             |  8 +--
 .../fluent/TopLevelsClient.java}              | 10 +--
 .../models/NestedProxyResourceInner.java      |  4 +-
 .../models/SingletonTrackedResourceInner.java |  4 +-
 .../models/TopLevelTrackedResourceInner.java  |  4 +-
 .../resources/fluent/models/package-info.java |  2 +-
 .../resources/fluent/package-info.java        |  2 +-
 .../NestedProxyResourceImpl.java              | 28 ++++----
 .../implementation/NestedsClientImpl.java}    | 37 +++++-----
 .../implementation/NestedsImpl.java}          | 25 ++++---
 .../implementation/ResourceManagerUtils.java  |  2 +-
 .../ResourcesClientBuilder.java               |  2 +-
 .../implementation/ResourcesClientImpl.java   | 52 +++++++-------
 .../SingletonTrackedResourceImpl.java         | 14 ++--
 .../implementation/SingletonsClientImpl.java} | 36 +++++-----
 .../implementation/SingletonsImpl.java}       | 26 +++----
 .../TopLevelTrackedResourceImpl.java          | 35 +++++-----
 .../implementation/TopLevelsClientImpl.java}  | 44 ++++++------
 .../implementation/TopLevelsImpl.java}        | 28 ++++----
 .../models/NestedProxyResourceListResult.java |  4 +-
 .../SingletonTrackedResourceListResult.java   |  4 +-
 .../TopLevelTrackedResourceListResult.java    |  4 +-
 .../implementation/package-info.java          |  2 +-
 .../resources/models/NestedProxyResource.java |  6 +-
 .../models/NestedProxyResourceProperties.java |  2 +-
 .../models/Nesteds.java}                      |  6 +-
 .../resources/models/NotificationDetails.java |  2 +-
 .../resources/models/ProvisioningState.java   |  2 +-
 .../models/SingletonTrackedResource.java      |  6 +-
 .../SingletonTrackedResourceProperties.java   |  2 +-
 .../models/Singletons.java}                   |  8 +--
 .../models/TopLevelTrackedResource.java       |  6 +-
 .../TopLevelTrackedResourceProperties.java    |  2 +-
 .../models/TopLevels.java}                    |  6 +-
 .../resources/models/package-info.java        |  2 +-
 .../{models => }/resources/package-info.java  |  2 +-
 .../proxy-config.json                         |  1 +
 .../reflect-config.json                       |  0
 .../proxy-config.json                         |  1 -
 .../proxy-config.json                         |  1 -
 .../proxy-config.json                         |  1 +
 .../reflect-config.json                       |  0
 .../ManagedIdentityManagerTests.java          | 21 +++---
 .../resources/ArmResourceTest.java            | 43 ++++++------
 70 files changed, 451 insertions(+), 456 deletions(-)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/ManagedIdentityManager.java => commonproperties/CommonPropertiesManager.java} (76%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/fluent/ManagedIdentityClient.java => commonproperties/fluent/CommonPropertiesClient.java} (71%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/fluent/ManagedIdentityTrackedResourcesClient.java => commonproperties/fluent/ManagedIdentitiesClient.java} (95%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/fluent/models/ManagedIdentityTrackedResourceInner.java (96%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties/fluent}/models/package-info.java (61%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties/fluent}/package-info.java (63%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/implementation/ManagedIdentityClientBuilder.java => commonproperties/implementation/CommonPropertiesClientBuilder.java} (70%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/implementation/ManagedIdentityClientImpl.java => commonproperties/implementation/CommonPropertiesClientImpl.java} (87%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesClientImpl.java => commonproperties/implementation/ManagedIdentitiesClientImpl.java} (94%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesImpl.java => commonproperties/implementation/ManagedIdentitiesImpl.java} (75%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/implementation/ManagedIdentityTrackedResourceImpl.java (81%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources => commonproperties}/implementation/ResourceManagerUtils.java (99%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/fluent => commonproperties/implementation}/package-info.java (60%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/models/ManagedIdentityTrackedResources.java => commonproperties/models/ManagedIdentities.java} (94%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/models/ManagedIdentityTrackedResource.java (96%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/models/ManagedIdentityTrackedResourceProperties.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/models/ManagedServiceIdentity.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/models/ManagedServiceIdentityType.java (96%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/models/UserAssignedIdentity.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity/implementation => commonproperties/models}/package-info.java (59%)
 create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/package-info.java
 delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/package-info.java
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/ResourcesManager.java (82%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/fluent/NestedProxyResourcesClient.java => resources/fluent/NestedsClient.java} (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/fluent/ResourcesClient.java (63%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/fluent/SingletonTrackedResourcesClient.java => resources/fluent/SingletonsClient.java} (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/fluent/TopLevelTrackedResourcesClient.java => resources/fluent/TopLevelsClient.java} (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/fluent/models/NestedProxyResourceInner.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/fluent/models/SingletonTrackedResourceInner.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/fluent/models/TopLevelTrackedResourceInner.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/fluent/models/package-info.java (80%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/fluent/package-info.java (81%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/NestedProxyResourceImpl.java (82%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/implementation/NestedProxyResourcesClientImpl.java => resources/implementation/NestedsClientImpl.java} (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/implementation/NestedProxyResourcesImpl.java => resources/implementation/NestedsImpl.java} (89%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/commontypes/managedidentity => resources}/implementation/ResourceManagerUtils.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/ResourcesClientBuilder.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/ResourcesClientImpl.java (83%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/SingletonTrackedResourceImpl.java (71%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/implementation/SingletonTrackedResourcesClientImpl.java => resources/implementation/SingletonsClientImpl.java} (96%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/implementation/SingletonTrackedResourcesImpl.java => resources/implementation/SingletonsImpl.java} (79%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/TopLevelTrackedResourceImpl.java (80%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/implementation/TopLevelTrackedResourcesClientImpl.java => resources/implementation/TopLevelsClientImpl.java} (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/implementation/TopLevelTrackedResourcesImpl.java => resources/implementation/TopLevelsImpl.java} (87%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/models/NestedProxyResourceListResult.java (95%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/models/SingletonTrackedResourceListResult.java (95%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/models/TopLevelTrackedResourceListResult.java (95%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/implementation/package-info.java (79%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/NestedProxyResource.java (95%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/NestedProxyResourceProperties.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/models/NestedProxyResources.java => resources/models/Nesteds.java} (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/NotificationDetails.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/ProvisioningState.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/SingletonTrackedResource.java (85%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/SingletonTrackedResourceProperties.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/models/SingletonTrackedResources.java => resources/models/Singletons.java} (96%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/TopLevelTrackedResource.java (97%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/TopLevelTrackedResourceProperties.java (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models/resources/models/TopLevelTrackedResources.java => resources/models/TopLevels.java} (98%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/models/package-info.java (81%)
 rename packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/{models => }/resources/package-info.java (83%)
 create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-commonproperties/proxy-config.json
 rename packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/{azure-resourcemanager-models-commontypes-managedidentity => azure-resourcemanager-commonproperties}/reflect-config.json (100%)
 delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-commontypes-managedidentity/proxy-config.json
 delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-resources/proxy-config.json
 create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-resources/proxy-config.json
 rename packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/{azure-resourcemanager-models-resources => azure-resourcemanager-resources}/reflect-config.json (100%)
 rename packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/{models/commontypes/managedidentity => commonproperties}/ManagedIdentityManagerTests.java (76%)
 rename packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/{models => }/resources/ArmResourceTest.java (87%)

diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json
index b77267bf5e..c724344b29 100644
--- a/packages/http-client-java/generator/http-client-generator-test/package.json
+++ b/packages/http-client-java/generator/http-client-generator-test/package.json
@@ -12,7 +12,7 @@
     "testserver-stop": "npx cadl-ranch server stop"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.37.6",
+    "@azure-tools/cadl-ranch-specs": "0.38.0",
     "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.0.tgz",
     "@typespec/http-client-java-tests": "file:"
   },
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/ManagedIdentityManager.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/CommonPropertiesManager.java
similarity index 76%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/ManagedIdentityManager.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/CommonPropertiesManager.java
index 17935e9ef8..474ad6c4d1 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/ManagedIdentityManager.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/CommonPropertiesManager.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity;
+package com.azure.resourcemanager.commonproperties;
 
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.http.HttpClient;
@@ -23,10 +23,10 @@
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.ManagedIdentityClient;
-import com.azure.resourcemanager.models.commontypes.managedidentity.implementation.ManagedIdentityClientBuilder;
-import com.azure.resourcemanager.models.commontypes.managedidentity.implementation.ManagedIdentityTrackedResourcesImpl;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResources;
+import com.azure.resourcemanager.commonproperties.fluent.CommonPropertiesClient;
+import com.azure.resourcemanager.commonproperties.implementation.CommonPropertiesClientBuilder;
+import com.azure.resourcemanager.commonproperties.implementation.ManagedIdentitiesImpl;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentities;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -35,18 +35,18 @@
 import java.util.stream.Collectors;
 
 /**
- * Entry point to ManagedIdentityManager.
+ * Entry point to CommonPropertiesManager.
  * Arm Managed Identity Provider management API.
  */
-public final class ManagedIdentityManager {
-    private ManagedIdentityTrackedResources managedIdentityTrackedResources;
+public final class CommonPropertiesManager {
+    private ManagedIdentities managedIdentities;
 
-    private final ManagedIdentityClient clientObject;
+    private final CommonPropertiesClient clientObject;
 
-    private ManagedIdentityManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
+    private CommonPropertiesManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
-        this.clientObject = new ManagedIdentityClientBuilder().pipeline(httpPipeline)
+        this.clientObject = new CommonPropertiesClientBuilder().pipeline(httpPipeline)
             .endpoint(profile.getEnvironment().getResourceManagerEndpoint())
             .subscriptionId(profile.getSubscriptionId())
             .defaultPollInterval(defaultPollInterval)
@@ -54,38 +54,38 @@ private ManagedIdentityManager(HttpPipeline httpPipeline, AzureProfile profile,
     }
 
     /**
-     * Creates an instance of ManagedIdentity service API entry point.
+     * Creates an instance of CommonProperties service API entry point.
      * 
      * @param credential the credential to use.
      * @param profile the Azure profile for client.
-     * @return the ManagedIdentity service API instance.
+     * @return the CommonProperties service API instance.
      */
-    public static ManagedIdentityManager authenticate(TokenCredential credential, AzureProfile profile) {
+    public static CommonPropertiesManager authenticate(TokenCredential credential, AzureProfile profile) {
         Objects.requireNonNull(credential, "'credential' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
         return configure().authenticate(credential, profile);
     }
 
     /**
-     * Creates an instance of ManagedIdentity service API entry point.
+     * Creates an instance of CommonProperties service API entry point.
      * 
      * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential.
      * @param profile the Azure profile for client.
-     * @return the ManagedIdentity service API instance.
+     * @return the CommonProperties service API instance.
      */
-    public static ManagedIdentityManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
+    public static CommonPropertiesManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
-        return new ManagedIdentityManager(httpPipeline, profile, null);
+        return new CommonPropertiesManager(httpPipeline, profile, null);
     }
 
     /**
-     * Gets a Configurable instance that can be used to create ManagedIdentityManager with optional configuration.
+     * Gets a Configurable instance that can be used to create CommonPropertiesManager with optional configuration.
      * 
      * @return the Configurable instance allowing configurations.
      */
     public static Configurable configure() {
-        return new ManagedIdentityManager.Configurable();
+        return new CommonPropertiesManager.Configurable();
     }
 
     /**
@@ -190,20 +190,20 @@ public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
         }
 
         /**
-         * Creates an instance of ManagedIdentity service API entry point.
+         * Creates an instance of CommonProperties service API entry point.
          *
          * @param credential the credential to use.
          * @param profile the Azure profile for client.
-         * @return the ManagedIdentity service API instance.
+         * @return the CommonProperties service API instance.
          */
-        public ManagedIdentityManager authenticate(TokenCredential credential, AzureProfile profile) {
+        public CommonPropertiesManager authenticate(TokenCredential credential, AzureProfile profile) {
             Objects.requireNonNull(credential, "'credential' cannot be null.");
             Objects.requireNonNull(profile, "'profile' cannot be null.");
 
             StringBuilder userAgentBuilder = new StringBuilder();
             userAgentBuilder.append("azsdk-java")
                 .append("-")
-                .append("com.azure.resourcemanager.models.commontypes.managedidentity")
+                .append("com.azure.resourcemanager.commonproperties")
                 .append("/")
                 .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
@@ -247,30 +247,29 @@ public ManagedIdentityManager authenticate(TokenCredential credential, AzureProf
             HttpPipeline httpPipeline = new HttpPipelineBuilder().httpClient(httpClient)
                 .policies(policies.toArray(new HttpPipelinePolicy[0]))
                 .build();
-            return new ManagedIdentityManager(httpPipeline, profile, defaultPollInterval);
+            return new CommonPropertiesManager(httpPipeline, profile, defaultPollInterval);
         }
     }
 
     /**
-     * Gets the resource collection API of ManagedIdentityTrackedResources. It manages ManagedIdentityTrackedResource.
+     * Gets the resource collection API of ManagedIdentities. It manages ManagedIdentityTrackedResource.
      * 
-     * @return Resource collection API of ManagedIdentityTrackedResources.
+     * @return Resource collection API of ManagedIdentities.
      */
-    public ManagedIdentityTrackedResources managedIdentityTrackedResources() {
-        if (this.managedIdentityTrackedResources == null) {
-            this.managedIdentityTrackedResources
-                = new ManagedIdentityTrackedResourcesImpl(clientObject.getManagedIdentityTrackedResources(), this);
+    public ManagedIdentities managedIdentities() {
+        if (this.managedIdentities == null) {
+            this.managedIdentities = new ManagedIdentitiesImpl(clientObject.getManagedIdentities(), this);
         }
-        return managedIdentityTrackedResources;
+        return managedIdentities;
     }
 
     /**
-     * Gets wrapped service client ManagedIdentityClient providing direct access to the underlying auto-generated API
+     * Gets wrapped service client CommonPropertiesClient providing direct access to the underlying auto-generated API
      * implementation, based on Azure REST API.
      * 
-     * @return Wrapped service client ManagedIdentityClient.
+     * @return Wrapped service client CommonPropertiesClient.
      */
-    public ManagedIdentityClient serviceClient() {
+    public CommonPropertiesClient serviceClient() {
         return this.clientObject;
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/ManagedIdentityClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/CommonPropertiesClient.java
similarity index 71%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/ManagedIdentityClient.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/CommonPropertiesClient.java
index f0a5e6ccd7..02c6f99362 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/ManagedIdentityClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/CommonPropertiesClient.java
@@ -2,15 +2,15 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent;
+package com.azure.resourcemanager.commonproperties.fluent;
 
 import com.azure.core.http.HttpPipeline;
 import java.time.Duration;
 
 /**
- * The interface for ManagedIdentityClient class.
+ * The interface for CommonPropertiesClient class.
  */
-public interface ManagedIdentityClient {
+public interface CommonPropertiesClient {
     /**
      * Gets Service host.
      * 
@@ -47,9 +47,9 @@ public interface ManagedIdentityClient {
     Duration getDefaultPollInterval();
 
     /**
-     * Gets the ManagedIdentityTrackedResourcesClient object to access its operations.
+     * Gets the ManagedIdentitiesClient object to access its operations.
      * 
-     * @return the ManagedIdentityTrackedResourcesClient object.
+     * @return the ManagedIdentitiesClient object.
      */
-    ManagedIdentityTrackedResourcesClient getManagedIdentityTrackedResources();
+    ManagedIdentitiesClient getManagedIdentities();
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/ManagedIdentityTrackedResourcesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/ManagedIdentitiesClient.java
similarity index 95%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/ManagedIdentityTrackedResourcesClient.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/ManagedIdentitiesClient.java
index 208c9fc223..7f3f64cba4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/ManagedIdentityTrackedResourcesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/ManagedIdentitiesClient.java
@@ -2,18 +2,18 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent;
+package com.azure.resourcemanager.commonproperties.fluent;
 
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceMethod;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner;
+import com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner;
 
 /**
- * An instance of this class provides access to all the operations defined in ManagedIdentityTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in ManagedIdentitiesClient.
  */
-public interface ManagedIdentityTrackedResourcesClient {
+public interface ManagedIdentitiesClient {
     /**
      * Get a ManagedIdentityTrackedResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/ManagedIdentityTrackedResourceInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/models/ManagedIdentityTrackedResourceInner.java
similarity index 96%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/ManagedIdentityTrackedResourceInner.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/models/ManagedIdentityTrackedResourceInner.java
index 473e219db8..ca17e7ddb9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/ManagedIdentityTrackedResourceInner.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/models/ManagedIdentityTrackedResourceInner.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models;
+package com.azure.resourcemanager.commonproperties.fluent.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
@@ -10,8 +10,8 @@
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResourceProperties;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedServiceIdentity;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties;
+import com.azure.resourcemanager.commonproperties.models.ManagedServiceIdentity;
 import java.io.IOException;
 import java.util.Map;
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/models/package-info.java
similarity index 61%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/models/package-info.java
index e4c8af4f35..dbea4eca7a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/models/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 /**
- * Package containing the data models for ManagedIdentity.
+ * Package containing the inner data models for CommonProperties.
  * Arm Managed Identity Provider management API.
  */
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.fluent.models;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/package-info.java
similarity index 63%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/package-info.java
index af8e915ac6..9deaf81a72 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/fluent/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 /**
- * Package containing the classes for ManagedIdentity.
+ * Package containing the service clients for CommonProperties.
  * Arm Managed Identity Provider management API.
  */
-package com.azure.resourcemanager.models.commontypes.managedidentity;
+package com.azure.resourcemanager.commonproperties.fluent;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientBuilder.java
similarity index 70%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityClientBuilder.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientBuilder.java
index ded7cbf3a7..5767ef679e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityClientBuilder.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientBuilder.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.annotation.ServiceClientBuilder;
 import com.azure.core.http.HttpPipeline;
@@ -15,10 +15,10 @@
 import java.time.Duration;
 
 /**
- * A builder for creating a new instance of the ManagedIdentityClientImpl type.
+ * A builder for creating a new instance of the CommonPropertiesClientImpl type.
  */
-@ServiceClientBuilder(serviceClients = { ManagedIdentityClientImpl.class })
-public final class ManagedIdentityClientBuilder {
+@ServiceClientBuilder(serviceClients = { CommonPropertiesClientImpl.class })
+public final class CommonPropertiesClientBuilder {
     /*
      * Service host
      */
@@ -28,9 +28,9 @@ public final class ManagedIdentityClientBuilder {
      * Sets Service host.
      * 
      * @param endpoint the endpoint value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder endpoint(String endpoint) {
+    public CommonPropertiesClientBuilder endpoint(String endpoint) {
         this.endpoint = endpoint;
         return this;
     }
@@ -44,9 +44,9 @@ public ManagedIdentityClientBuilder endpoint(String endpoint) {
      * Sets The ID of the target subscription. The value must be an UUID.
      * 
      * @param subscriptionId the subscriptionId value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder subscriptionId(String subscriptionId) {
+    public CommonPropertiesClientBuilder subscriptionId(String subscriptionId) {
         this.subscriptionId = subscriptionId;
         return this;
     }
@@ -60,9 +60,9 @@ public ManagedIdentityClientBuilder subscriptionId(String subscriptionId) {
      * Sets The environment to connect to.
      * 
      * @param environment the environment value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder environment(AzureEnvironment environment) {
+    public CommonPropertiesClientBuilder environment(AzureEnvironment environment) {
         this.environment = environment;
         return this;
     }
@@ -76,9 +76,9 @@ public ManagedIdentityClientBuilder environment(AzureEnvironment environment) {
      * Sets The HTTP pipeline to send requests through.
      * 
      * @param pipeline the pipeline value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder pipeline(HttpPipeline pipeline) {
+    public CommonPropertiesClientBuilder pipeline(HttpPipeline pipeline) {
         this.pipeline = pipeline;
         return this;
     }
@@ -92,9 +92,9 @@ public ManagedIdentityClientBuilder pipeline(HttpPipeline pipeline) {
      * Sets The default poll interval for long-running operation.
      * 
      * @param defaultPollInterval the defaultPollInterval value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder defaultPollInterval(Duration defaultPollInterval) {
+    public CommonPropertiesClientBuilder defaultPollInterval(Duration defaultPollInterval) {
         this.defaultPollInterval = defaultPollInterval;
         return this;
     }
@@ -108,19 +108,19 @@ public ManagedIdentityClientBuilder defaultPollInterval(Duration defaultPollInte
      * Sets The serializer to serialize an object into a string.
      * 
      * @param serializerAdapter the serializerAdapter value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
+    public CommonPropertiesClientBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
         this.serializerAdapter = serializerAdapter;
         return this;
     }
 
     /**
-     * Builds an instance of ManagedIdentityClientImpl with the provided parameters.
+     * Builds an instance of CommonPropertiesClientImpl with the provided parameters.
      * 
-     * @return an instance of ManagedIdentityClientImpl.
+     * @return an instance of CommonPropertiesClientImpl.
      */
-    public ManagedIdentityClientImpl buildClient() {
+    public CommonPropertiesClientImpl buildClient() {
         String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
@@ -131,7 +131,7 @@ public ManagedIdentityClientImpl buildClient() {
         SerializerAdapter localSerializerAdapter = (serializerAdapter != null)
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
-        ManagedIdentityClientImpl client = new ManagedIdentityClientImpl(localPipeline, localSerializerAdapter,
+        CommonPropertiesClientImpl client = new CommonPropertiesClientImpl(localPipeline, localSerializerAdapter,
             localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientImpl.java
similarity index 87%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityClientImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientImpl.java
index 7de2f07ff4..77a335669f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/CommonPropertiesClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.annotation.ServiceClient;
 import com.azure.core.http.HttpHeaderName;
@@ -23,8 +23,8 @@
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.core.util.serializer.SerializerEncoding;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.ManagedIdentityClient;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.ManagedIdentityTrackedResourcesClient;
+import com.azure.resourcemanager.commonproperties.fluent.CommonPropertiesClient;
+import com.azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
@@ -35,10 +35,10 @@
 import reactor.core.publisher.Mono;
 
 /**
- * Initializes a new instance of the ManagedIdentityClientImpl type.
+ * Initializes a new instance of the CommonPropertiesClientImpl type.
  */
-@ServiceClient(builder = ManagedIdentityClientBuilder.class)
-public final class ManagedIdentityClientImpl implements ManagedIdentityClient {
+@ServiceClient(builder = CommonPropertiesClientBuilder.class)
+public final class CommonPropertiesClientImpl implements CommonPropertiesClient {
     /**
      * Service host.
      */
@@ -124,21 +124,21 @@ public Duration getDefaultPollInterval() {
     }
 
     /**
-     * The ManagedIdentityTrackedResourcesClient object to access its operations.
+     * The ManagedIdentitiesClient object to access its operations.
      */
-    private final ManagedIdentityTrackedResourcesClient managedIdentityTrackedResources;
+    private final ManagedIdentitiesClient managedIdentities;
 
     /**
-     * Gets the ManagedIdentityTrackedResourcesClient object to access its operations.
+     * Gets the ManagedIdentitiesClient object to access its operations.
      * 
-     * @return the ManagedIdentityTrackedResourcesClient object.
+     * @return the ManagedIdentitiesClient object.
      */
-    public ManagedIdentityTrackedResourcesClient getManagedIdentityTrackedResources() {
-        return this.managedIdentityTrackedResources;
+    public ManagedIdentitiesClient getManagedIdentities() {
+        return this.managedIdentities;
     }
 
     /**
-     * Initializes an instance of ManagedIdentityClient client.
+     * Initializes an instance of CommonPropertiesClient client.
      * 
      * @param httpPipeline The HTTP pipeline to send requests through.
      * @param serializerAdapter The serializer to serialize an object into a string.
@@ -147,7 +147,7 @@ public ManagedIdentityTrackedResourcesClient getManagedIdentityTrackedResources(
      * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
-    ManagedIdentityClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter,
+    CommonPropertiesClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter,
         Duration defaultPollInterval, AzureEnvironment environment, String endpoint, String subscriptionId) {
         this.httpPipeline = httpPipeline;
         this.serializerAdapter = serializerAdapter;
@@ -155,7 +155,7 @@ public ManagedIdentityTrackedResourcesClient getManagedIdentityTrackedResources(
         this.endpoint = endpoint;
         this.subscriptionId = subscriptionId;
         this.apiVersion = "2023-12-01-preview";
-        this.managedIdentityTrackedResources = new ManagedIdentityTrackedResourcesClientImpl(this);
+        this.managedIdentities = new ManagedIdentitiesClientImpl(this);
     }
 
     /**
@@ -284,5 +284,5 @@ public Mono<String> getBodyAsString(Charset charset) {
         }
     }
 
-    private static final ClientLogger LOGGER = new ClientLogger(ManagedIdentityClientImpl.class);
+    private static final ClientLogger LOGGER = new ClientLogger(CommonPropertiesClientImpl.class);
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesClientImpl.java
similarity index 94%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesClientImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesClientImpl.java
index bd271c409a..2cdf584c01 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.ExpectedResponses;
@@ -24,44 +24,44 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.ManagedIdentityTrackedResourcesClient;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner;
+import com.azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient;
+import com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner;
 import reactor.core.publisher.Mono;
 
 /**
- * An instance of this class provides access to all the operations defined in ManagedIdentityTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in ManagedIdentitiesClient.
  */
-public final class ManagedIdentityTrackedResourcesClientImpl implements ManagedIdentityTrackedResourcesClient {
+public final class ManagedIdentitiesClientImpl implements ManagedIdentitiesClient {
     /**
      * The proxy service used to perform REST calls.
      */
-    private final ManagedIdentityTrackedResourcesService service;
+    private final ManagedIdentitiesService service;
 
     /**
      * The service client containing this operation class.
      */
-    private final ManagedIdentityClientImpl client;
+    private final CommonPropertiesClientImpl client;
 
     /**
-     * Initializes an instance of ManagedIdentityTrackedResourcesClientImpl.
+     * Initializes an instance of ManagedIdentitiesClientImpl.
      * 
      * @param client the instance of the service client containing this operation class.
      */
-    ManagedIdentityTrackedResourcesClientImpl(ManagedIdentityClientImpl client) {
-        this.service = RestProxy.create(ManagedIdentityTrackedResourcesService.class, client.getHttpPipeline(),
-            client.getSerializerAdapter());
+    ManagedIdentitiesClientImpl(CommonPropertiesClientImpl client) {
+        this.service
+            = RestProxy.create(ManagedIdentitiesService.class, client.getHttpPipeline(), client.getSerializerAdapter());
         this.client = client;
     }
 
     /**
-     * The interface defining all the services for ManagedIdentityClientManagedIdentityTrackedResources to be used by
-     * the proxy service to perform REST calls.
+     * The interface defining all the services for CommonPropertiesClientManagedIdentities to be used by the proxy
+     * service to perform REST calls.
      */
     @Host("{endpoint}")
-    @ServiceInterface(name = "ManagedIdentityClien")
-    public interface ManagedIdentityTrackedResourcesService {
+    @ServiceInterface(name = "CommonPropertiesClie")
+    public interface ManagedIdentitiesService {
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<ManagedIdentityTrackedResourceInner>> getByResourceGroup(@HostParam("endpoint") String endpoint,
@@ -70,7 +70,7 @@ Mono<Response<ManagedIdentityTrackedResourceInner>> getByResourceGroup(@HostPara
             @PathParam("managedIdentityTrackedResourceName") String managedIdentityTrackedResourceName,
             @HeaderParam("Accept") String accept, Context context);
 
-        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}")
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<ManagedIdentityTrackedResourceInner>> createWithSystemAssigned(
@@ -81,7 +81,7 @@ Mono<Response<ManagedIdentityTrackedResourceInner>> createWithSystemAssigned(
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") ManagedIdentityTrackedResourceInner resource, Context context);
 
-        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.CommonTypes.ManagedIdentity/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}")
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<ManagedIdentityTrackedResourceInner>> updateWithUserAssignedAndSystemAssigned(
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java
similarity index 75%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java
index e364375b7e..8730fff7f4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourcesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentitiesImpl.java
@@ -2,26 +2,26 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.ManagedIdentityTrackedResourcesClient;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResource;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResources;
+import com.azure.resourcemanager.commonproperties.fluent.ManagedIdentitiesClient;
+import com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentities;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResource;
 
-public final class ManagedIdentityTrackedResourcesImpl implements ManagedIdentityTrackedResources {
-    private static final ClientLogger LOGGER = new ClientLogger(ManagedIdentityTrackedResourcesImpl.class);
+public final class ManagedIdentitiesImpl implements ManagedIdentities {
+    private static final ClientLogger LOGGER = new ClientLogger(ManagedIdentitiesImpl.class);
 
-    private final ManagedIdentityTrackedResourcesClient innerClient;
+    private final ManagedIdentitiesClient innerClient;
 
-    private final com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager serviceManager;
+    private final com.azure.resourcemanager.commonproperties.CommonPropertiesManager serviceManager;
 
-    public ManagedIdentityTrackedResourcesImpl(ManagedIdentityTrackedResourcesClient innerClient,
-        com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager serviceManager) {
+    public ManagedIdentitiesImpl(ManagedIdentitiesClient innerClient,
+        com.azure.resourcemanager.commonproperties.CommonPropertiesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -80,11 +80,11 @@ public Response<ManagedIdentityTrackedResource> getByIdWithResponse(String id, C
         return this.getByResourceGroupWithResponse(resourceGroupName, managedIdentityTrackedResourceName, context);
     }
 
-    private ManagedIdentityTrackedResourcesClient serviceClient() {
+    private ManagedIdentitiesClient serviceClient() {
         return this.innerClient;
     }
 
-    private com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager manager() {
+    private com.azure.resourcemanager.commonproperties.CommonPropertiesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourceImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentityTrackedResourceImpl.java
similarity index 81%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourceImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentityTrackedResourceImpl.java
index b37b5e9492..0b12098fa2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ManagedIdentityTrackedResourceImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ManagedIdentityTrackedResourceImpl.java
@@ -2,15 +2,15 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.management.Region;
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResource;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResourceProperties;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedServiceIdentity;
+import com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResource;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties;
+import com.azure.resourcemanager.commonproperties.models.ManagedServiceIdentity;
 import java.util.Collections;
 import java.util.Map;
 
@@ -18,7 +18,7 @@ public final class ManagedIdentityTrackedResourceImpl implements ManagedIdentity
     ManagedIdentityTrackedResource.Definition, ManagedIdentityTrackedResource.Update {
     private ManagedIdentityTrackedResourceInner innerObject;
 
-    private final com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager serviceManager;
+    private final com.azure.resourcemanager.commonproperties.CommonPropertiesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -73,7 +73,7 @@ public ManagedIdentityTrackedResourceInner innerModel() {
         return this.innerObject;
     }
 
-    private com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager manager() {
+    private com.azure.resourcemanager.commonproperties.CommonPropertiesManager manager() {
         return this.serviceManager;
     }
 
@@ -88,7 +88,7 @@ public ManagedIdentityTrackedResourceImpl withExistingResourceGroup(String resou
 
     public ManagedIdentityTrackedResource create() {
         this.innerObject = serviceManager.serviceClient()
-            .getManagedIdentityTrackedResources()
+            .getManagedIdentities()
             .createWithSystemAssignedWithResponse(resourceGroupName, managedIdentityTrackedResourceName,
                 this.innerModel(), Context.NONE)
             .getValue();
@@ -97,7 +97,7 @@ public ManagedIdentityTrackedResource create() {
 
     public ManagedIdentityTrackedResource create(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getManagedIdentityTrackedResources()
+            .getManagedIdentities()
             .createWithSystemAssignedWithResponse(resourceGroupName, managedIdentityTrackedResourceName,
                 this.innerModel(), context)
             .getValue();
@@ -105,7 +105,7 @@ public ManagedIdentityTrackedResource create(Context context) {
     }
 
     ManagedIdentityTrackedResourceImpl(String name,
-        com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager serviceManager) {
+        com.azure.resourcemanager.commonproperties.CommonPropertiesManager serviceManager) {
         this.innerObject = new ManagedIdentityTrackedResourceInner();
         this.serviceManager = serviceManager;
         this.managedIdentityTrackedResourceName = name;
@@ -117,7 +117,7 @@ public ManagedIdentityTrackedResourceImpl update() {
 
     public ManagedIdentityTrackedResource apply() {
         this.innerObject = serviceManager.serviceClient()
-            .getManagedIdentityTrackedResources()
+            .getManagedIdentities()
             .updateWithUserAssignedAndSystemAssignedWithResponse(resourceGroupName, managedIdentityTrackedResourceName,
                 this.innerModel(), Context.NONE)
             .getValue();
@@ -126,7 +126,7 @@ public ManagedIdentityTrackedResource apply() {
 
     public ManagedIdentityTrackedResource apply(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getManagedIdentityTrackedResources()
+            .getManagedIdentities()
             .updateWithUserAssignedAndSystemAssignedWithResponse(resourceGroupName, managedIdentityTrackedResourceName,
                 this.innerModel(), context)
             .getValue();
@@ -134,7 +134,7 @@ public ManagedIdentityTrackedResource apply(Context context) {
     }
 
     ManagedIdentityTrackedResourceImpl(ManagedIdentityTrackedResourceInner innerObject,
-        com.azure.resourcemanager.models.commontypes.managedidentity.ManagedIdentityManager serviceManager) {
+        com.azure.resourcemanager.commonproperties.CommonPropertiesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
@@ -144,7 +144,7 @@ public ManagedIdentityTrackedResource apply(Context context) {
 
     public ManagedIdentityTrackedResource refresh() {
         this.innerObject = serviceManager.serviceClient()
-            .getManagedIdentityTrackedResources()
+            .getManagedIdentities()
             .getByResourceGroupWithResponse(resourceGroupName, managedIdentityTrackedResourceName, Context.NONE)
             .getValue();
         return this;
@@ -152,7 +152,7 @@ public ManagedIdentityTrackedResource refresh() {
 
     public ManagedIdentityTrackedResource refresh(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getManagedIdentityTrackedResources()
+            .getManagedIdentities()
             .getByResourceGroupWithResponse(resourceGroupName, managedIdentityTrackedResourceName, context)
             .getValue();
         return this;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourceManagerUtils.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ResourceManagerUtils.java
similarity index 99%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourceManagerUtils.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ResourceManagerUtils.java
index d063f370fc..12d1bd0816 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourceManagerUtils.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/ResourceManagerUtils.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.http.rest.PagedFlux;
 import com.azure.core.http.rest.PagedIterable;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/package-info.java
similarity index 60%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/package-info.java
index 56076e0ece..fabc22e2de 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/implementation/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 /**
- * Package containing the service clients for ManagedIdentity.
+ * Package containing the implementations for CommonProperties.
  * Arm Managed Identity Provider management API.
  */
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent;
+package com.azure.resourcemanager.commonproperties.implementation;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResources.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentities.java
similarity index 94%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResources.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentities.java
index 47029516e9..ad621c01f9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResources.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentities.java
@@ -2,15 +2,15 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.models;
 
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 
 /**
- * Resource collection API of ManagedIdentityTrackedResources.
+ * Resource collection API of ManagedIdentities.
  */
-public interface ManagedIdentityTrackedResources {
+public interface ManagedIdentities {
     /**
      * Get a ManagedIdentityTrackedResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResource.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResource.java
similarity index 96%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResource.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResource.java
index 7eae768285..0677fd3017 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResource.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResource.java
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.models;
 
 import com.azure.core.management.Region;
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner;
+import com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner;
 import java.util.Map;
 
 /**
@@ -92,8 +92,7 @@ public interface ManagedIdentityTrackedResource {
     String resourceGroupName();
 
     /**
-     * Gets the inner
-     * com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner
+     * Gets the inner com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner
      * object.
      * 
      * @return the inner object.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResourceProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResourceProperties.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResourceProperties.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResourceProperties.java
index acad3bd5e1..c6fd0e7d24 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedIdentityTrackedResourceProperties.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedIdentityTrackedResourceProperties.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.models;
 
 import com.azure.core.annotation.Immutable;
 import com.azure.json.JsonReader;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentity.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedServiceIdentity.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentity.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedServiceIdentity.java
index b04ee81198..b97a7aad1c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentity.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedServiceIdentity.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedServiceIdentityType.java
similarity index 96%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedServiceIdentityType.java
index 5f46b8922d..ec167d7d0d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/ManagedServiceIdentityType.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.models;
 
 import com.azure.core.util.ExpandableStringEnum;
 import java.util.Collection;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/UserAssignedIdentity.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/UserAssignedIdentity.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/UserAssignedIdentity.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/UserAssignedIdentity.java
index 5a60a19ba2..379ef7a29a 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/models/UserAssignedIdentity.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/UserAssignedIdentity.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.models;
 
 import com.azure.core.annotation.Immutable;
 import com.azure.json.JsonReader;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/package-info.java
similarity index 59%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/package-info.java
index fd11200641..47824ec6da 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/models/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 /**
- * Package containing the implementations for ManagedIdentity.
+ * Package containing the data models for CommonProperties.
  * Arm Managed Identity Provider management API.
  */
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.models;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/package-info.java
new file mode 100644
index 0000000000..4d19644a39
--- /dev/null
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/commonproperties/package-info.java
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+/**
+ * Package containing the classes for CommonProperties.
+ * Arm Managed Identity Provider management API.
+ */
+package com.azure.resourcemanager.commonproperties;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/package-info.java
deleted file mode 100644
index 7cb562268b..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/fluent/models/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-/**
- * Package containing the inner data models for ManagedIdentity.
- * Arm Managed Identity Provider management API.
- */
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/ResourcesManager.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/ResourcesManager.java
similarity index 82%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/ResourcesManager.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/ResourcesManager.java
index 772e8a6d7b..6effb18705 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/ResourcesManager.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/ResourcesManager.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources;
+package com.azure.resourcemanager.resources;
 
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.http.HttpClient;
@@ -23,14 +23,14 @@
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.resources.fluent.ResourcesClient;
-import com.azure.resourcemanager.models.resources.implementation.NestedProxyResourcesImpl;
-import com.azure.resourcemanager.models.resources.implementation.ResourcesClientBuilder;
-import com.azure.resourcemanager.models.resources.implementation.SingletonTrackedResourcesImpl;
-import com.azure.resourcemanager.models.resources.implementation.TopLevelTrackedResourcesImpl;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResources;
-import com.azure.resourcemanager.models.resources.models.SingletonTrackedResources;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResources;
+import com.azure.resourcemanager.resources.fluent.ResourcesClient;
+import com.azure.resourcemanager.resources.implementation.NestedsImpl;
+import com.azure.resourcemanager.resources.implementation.ResourcesClientBuilder;
+import com.azure.resourcemanager.resources.implementation.SingletonsImpl;
+import com.azure.resourcemanager.resources.implementation.TopLevelsImpl;
+import com.azure.resourcemanager.resources.models.Nesteds;
+import com.azure.resourcemanager.resources.models.Singletons;
+import com.azure.resourcemanager.resources.models.TopLevels;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -43,11 +43,11 @@
  * Arm Resource Provider management API.
  */
 public final class ResourcesManager {
-    private TopLevelTrackedResources topLevelTrackedResources;
+    private TopLevels topLevels;
 
-    private NestedProxyResources nestedProxyResources;
+    private Nesteds nesteds;
 
-    private SingletonTrackedResources singletonTrackedResources;
+    private Singletons singletons;
 
     private final ResourcesClient clientObject;
 
@@ -211,7 +211,7 @@ public ResourcesManager authenticate(TokenCredential credential, AzureProfile pr
             StringBuilder userAgentBuilder = new StringBuilder();
             userAgentBuilder.append("azsdk-java")
                 .append("-")
-                .append("com.azure.resourcemanager.models.resources")
+                .append("com.azure.resourcemanager.resources")
                 .append("/")
                 .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
@@ -260,41 +260,39 @@ public ResourcesManager authenticate(TokenCredential credential, AzureProfile pr
     }
 
     /**
-     * Gets the resource collection API of TopLevelTrackedResources. It manages TopLevelTrackedResource.
+     * Gets the resource collection API of TopLevels. It manages TopLevelTrackedResource.
      * 
-     * @return Resource collection API of TopLevelTrackedResources.
+     * @return Resource collection API of TopLevels.
      */
-    public TopLevelTrackedResources topLevelTrackedResources() {
-        if (this.topLevelTrackedResources == null) {
-            this.topLevelTrackedResources
-                = new TopLevelTrackedResourcesImpl(clientObject.getTopLevelTrackedResources(), this);
+    public TopLevels topLevels() {
+        if (this.topLevels == null) {
+            this.topLevels = new TopLevelsImpl(clientObject.getTopLevels(), this);
         }
-        return topLevelTrackedResources;
+        return topLevels;
     }
 
     /**
-     * Gets the resource collection API of NestedProxyResources. It manages NestedProxyResource.
+     * Gets the resource collection API of Nesteds. It manages NestedProxyResource.
      * 
-     * @return Resource collection API of NestedProxyResources.
+     * @return Resource collection API of Nesteds.
      */
-    public NestedProxyResources nestedProxyResources() {
-        if (this.nestedProxyResources == null) {
-            this.nestedProxyResources = new NestedProxyResourcesImpl(clientObject.getNestedProxyResources(), this);
+    public Nesteds nesteds() {
+        if (this.nesteds == null) {
+            this.nesteds = new NestedsImpl(clientObject.getNesteds(), this);
         }
-        return nestedProxyResources;
+        return nesteds;
     }
 
     /**
-     * Gets the resource collection API of SingletonTrackedResources.
+     * Gets the resource collection API of Singletons.
      * 
-     * @return Resource collection API of SingletonTrackedResources.
+     * @return Resource collection API of Singletons.
      */
-    public SingletonTrackedResources singletonTrackedResources() {
-        if (this.singletonTrackedResources == null) {
-            this.singletonTrackedResources
-                = new SingletonTrackedResourcesImpl(clientObject.getSingletonTrackedResources(), this);
+    public Singletons singletons() {
+        if (this.singletons == null) {
+            this.singletons = new SingletonsImpl(clientObject.getSingletons(), this);
         }
-        return singletonTrackedResources;
+        return singletons;
     }
 
     /**
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/NestedProxyResourcesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/NestedsClient.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/NestedProxyResourcesClient.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/NestedsClient.java
index a363155ee0..92123a44c2 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/NestedProxyResourcesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/NestedsClient.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent;
+package com.azure.resourcemanager.resources.fluent;
 
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceMethod;
@@ -11,12 +11,12 @@
 import com.azure.core.management.polling.PollResult;
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.SyncPoller;
-import com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner;
 
 /**
- * An instance of this class provides access to all the operations defined in NestedProxyResourcesClient.
+ * An instance of this class provides access to all the operations defined in NestedsClient.
  */
-public interface NestedProxyResourcesClient {
+public interface NestedsClient {
     /**
      * Get a NestedProxyResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/ResourcesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/ResourcesClient.java
similarity index 63%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/ResourcesClient.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/ResourcesClient.java
index 9f2ed05458..acdc93a0a6 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/ResourcesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/ResourcesClient.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent;
+package com.azure.resourcemanager.resources.fluent;
 
 import com.azure.core.http.HttpPipeline;
 import java.time.Duration;
@@ -47,23 +47,23 @@ public interface ResourcesClient {
     Duration getDefaultPollInterval();
 
     /**
-     * Gets the TopLevelTrackedResourcesClient object to access its operations.
+     * Gets the TopLevelsClient object to access its operations.
      * 
-     * @return the TopLevelTrackedResourcesClient object.
+     * @return the TopLevelsClient object.
      */
-    TopLevelTrackedResourcesClient getTopLevelTrackedResources();
+    TopLevelsClient getTopLevels();
 
     /**
-     * Gets the NestedProxyResourcesClient object to access its operations.
+     * Gets the NestedsClient object to access its operations.
      * 
-     * @return the NestedProxyResourcesClient object.
+     * @return the NestedsClient object.
      */
-    NestedProxyResourcesClient getNestedProxyResources();
+    NestedsClient getNesteds();
 
     /**
-     * Gets the SingletonTrackedResourcesClient object to access its operations.
+     * Gets the SingletonsClient object to access its operations.
      * 
-     * @return the SingletonTrackedResourcesClient object.
+     * @return the SingletonsClient object.
      */
-    SingletonTrackedResourcesClient getSingletonTrackedResources();
+    SingletonsClient getSingletons();
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/SingletonTrackedResourcesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/SingletonsClient.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/SingletonTrackedResourcesClient.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/SingletonsClient.java
index 0c95e1f8da..6699d3e983 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/SingletonTrackedResourcesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/SingletonsClient.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent;
+package com.azure.resourcemanager.resources.fluent;
 
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceMethod;
@@ -11,12 +11,12 @@
 import com.azure.core.management.polling.PollResult;
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.SyncPoller;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
 
 /**
- * An instance of this class provides access to all the operations defined in SingletonTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in SingletonsClient.
  */
-public interface SingletonTrackedResourcesClient {
+public interface SingletonsClient {
     /**
      * Get a SingletonTrackedResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/TopLevelTrackedResourcesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/TopLevelsClient.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/TopLevelTrackedResourcesClient.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/TopLevelsClient.java
index af8f1cc251..cf7188d390 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/TopLevelTrackedResourcesClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/TopLevelsClient.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent;
+package com.azure.resourcemanager.resources.fluent;
 
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceMethod;
@@ -11,13 +11,13 @@
 import com.azure.core.management.polling.PollResult;
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.SyncPoller;
-import com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.models.NotificationDetails;
+import com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner;
+import com.azure.resourcemanager.resources.models.NotificationDetails;
 
 /**
- * An instance of this class provides access to all the operations defined in TopLevelTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in TopLevelsClient.
  */
-public interface TopLevelTrackedResourcesClient {
+public interface TopLevelsClient {
     /**
      * Get a TopLevelTrackedResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/NestedProxyResourceInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/NestedProxyResourceInner.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/NestedProxyResourceInner.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/NestedProxyResourceInner.java
index 8f9cd74164..2f1afea3f7 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/NestedProxyResourceInner.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/NestedProxyResourceInner.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent.models;
+package com.azure.resourcemanager.resources.fluent.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.ProxyResource;
@@ -10,7 +10,7 @@
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResourceProperties;
+import com.azure.resourcemanager.resources.models.NestedProxyResourceProperties;
 import java.io.IOException;
 
 /**
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/SingletonTrackedResourceInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/SingletonTrackedResourceInner.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/SingletonTrackedResourceInner.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/SingletonTrackedResourceInner.java
index d96e1347a3..04bdda3c51 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/SingletonTrackedResourceInner.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/SingletonTrackedResourceInner.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent.models;
+package com.azure.resourcemanager.resources.fluent.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
@@ -10,7 +10,7 @@
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.resources.models.SingletonTrackedResourceProperties;
+import com.azure.resourcemanager.resources.models.SingletonTrackedResourceProperties;
 import java.io.IOException;
 import java.util.Map;
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/TopLevelTrackedResourceInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/TopLevelTrackedResourceInner.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/TopLevelTrackedResourceInner.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/TopLevelTrackedResourceInner.java
index 156b629584..1307507532 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/TopLevelTrackedResourceInner.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/TopLevelTrackedResourceInner.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.fluent.models;
+package com.azure.resourcemanager.resources.fluent.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
@@ -10,7 +10,7 @@
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResourceProperties;
+import com.azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties;
 import java.io.IOException;
 import java.util.Map;
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/package-info.java
similarity index 80%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/package-info.java
index 86b8f5b6a0..b2ef5db3e0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/models/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/models/package-info.java
@@ -6,4 +6,4 @@
  * Package containing the inner data models for Resources.
  * Arm Resource Provider management API.
  */
-package com.azure.resourcemanager.models.resources.fluent.models;
+package com.azure.resourcemanager.resources.fluent.models;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/package-info.java
similarity index 81%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/package-info.java
index 492a2d30ce..f7f16fba10 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/fluent/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/fluent/package-info.java
@@ -6,4 +6,4 @@
  * Package containing the service clients for Resources.
  * Arm Resource Provider management API.
  */
-package com.azure.resourcemanager.models.resources.fluent;
+package com.azure.resourcemanager.resources.fluent;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourceImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedProxyResourceImpl.java
similarity index 82%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourceImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedProxyResourceImpl.java
index 8b09cccfdb..6e3b088132 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourceImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedProxyResourceImpl.java
@@ -2,19 +2,19 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResource;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResourceProperties;
+import com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner;
+import com.azure.resourcemanager.resources.models.NestedProxyResource;
+import com.azure.resourcemanager.resources.models.NestedProxyResourceProperties;
 
 public final class NestedProxyResourceImpl
     implements NestedProxyResource, NestedProxyResource.Definition, NestedProxyResource.Update {
     private NestedProxyResourceInner innerObject;
 
-    private final com.azure.resourcemanager.models.resources.ResourcesManager serviceManager;
+    private final com.azure.resourcemanager.resources.ResourcesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -44,7 +44,7 @@ public NestedProxyResourceInner innerModel() {
         return this.innerObject;
     }
 
-    private com.azure.resourcemanager.models.resources.ResourcesManager manager() {
+    private com.azure.resourcemanager.resources.ResourcesManager manager() {
         return this.serviceManager;
     }
 
@@ -63,7 +63,7 @@ public NestedProxyResourceImpl withExistingTopLevelTrackedResource(String resour
 
     public NestedProxyResource create() {
         this.innerObject = serviceManager.serviceClient()
-            .getNestedProxyResources()
+            .getNesteds()
             .createOrReplace(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, this.innerModel(),
                 Context.NONE);
         return this;
@@ -71,13 +71,13 @@ public NestedProxyResource create() {
 
     public NestedProxyResource create(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getNestedProxyResources()
+            .getNesteds()
             .createOrReplace(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, this.innerModel(),
                 context);
         return this;
     }
 
-    NestedProxyResourceImpl(String name, com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+    NestedProxyResourceImpl(String name, com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerObject = new NestedProxyResourceInner();
         this.serviceManager = serviceManager;
         this.nextedProxyResourceName = name;
@@ -89,7 +89,7 @@ public NestedProxyResourceImpl update() {
 
     public NestedProxyResource apply() {
         this.innerObject = serviceManager.serviceClient()
-            .getNestedProxyResources()
+            .getNesteds()
             .update(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, this.innerModel(),
                 Context.NONE);
         return this;
@@ -97,14 +97,14 @@ public NestedProxyResource apply() {
 
     public NestedProxyResource apply(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getNestedProxyResources()
+            .getNesteds()
             .update(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, this.innerModel(),
                 context);
         return this;
     }
 
     NestedProxyResourceImpl(NestedProxyResourceInner innerObject,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+        com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
@@ -116,7 +116,7 @@ public NestedProxyResource apply(Context context) {
 
     public NestedProxyResource refresh() {
         this.innerObject = serviceManager.serviceClient()
-            .getNestedProxyResources()
+            .getNesteds()
             .getWithResponse(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, Context.NONE)
             .getValue();
         return this;
@@ -124,7 +124,7 @@ public NestedProxyResource refresh() {
 
     public NestedProxyResource refresh(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getNestedProxyResources()
+            .getNesteds()
             .getWithResponse(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, context)
             .getValue();
         return this;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourcesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedsClientImpl.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourcesClientImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedsClientImpl.java
index 703c3cc8bf..bdb231821e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourcesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedsClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.Delete;
@@ -32,21 +32,21 @@
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
-import com.azure.resourcemanager.models.resources.fluent.NestedProxyResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner;
-import com.azure.resourcemanager.models.resources.implementation.models.NestedProxyResourceListResult;
+import com.azure.resourcemanager.resources.fluent.NestedsClient;
+import com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner;
+import com.azure.resourcemanager.resources.implementation.models.NestedProxyResourceListResult;
 import java.nio.ByteBuffer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * An instance of this class provides access to all the operations defined in NestedProxyResourcesClient.
+ * An instance of this class provides access to all the operations defined in NestedsClient.
  */
-public final class NestedProxyResourcesClientImpl implements NestedProxyResourcesClient {
+public final class NestedsClientImpl implements NestedsClient {
     /**
      * The proxy service used to perform REST calls.
      */
-    private final NestedProxyResourcesService service;
+    private final NestedsService service;
 
     /**
      * The service client containing this operation class.
@@ -54,25 +54,24 @@ public final class NestedProxyResourcesClientImpl implements NestedProxyResource
     private final ResourcesClientImpl client;
 
     /**
-     * Initializes an instance of NestedProxyResourcesClientImpl.
+     * Initializes an instance of NestedsClientImpl.
      * 
      * @param client the instance of the service client containing this operation class.
      */
-    NestedProxyResourcesClientImpl(ResourcesClientImpl client) {
-        this.service = RestProxy.create(NestedProxyResourcesService.class, client.getHttpPipeline(),
-            client.getSerializerAdapter());
+    NestedsClientImpl(ResourcesClientImpl client) {
+        this.service = RestProxy.create(NestedsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
         this.client = client;
     }
 
     /**
-     * The interface defining all the services for ResourcesClientNestedProxyResources to be used by the proxy service
-     * to perform REST calls.
+     * The interface defining all the services for ResourcesClientNesteds to be used by the proxy service to perform
+     * REST calls.
      */
     @Host("{endpoint}")
     @ServiceInterface(name = "ResourcesClientNeste")
-    public interface NestedProxyResourcesService {
+    public interface NestedsService {
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<NestedProxyResourceInner>> get(@HostParam("endpoint") String endpoint,
@@ -82,7 +81,7 @@ Mono<Response<NestedProxyResourceInner>> get(@HostParam("endpoint") String endpo
             @PathParam("nextedProxyResourceName") String nextedProxyResourceName, @HeaderParam("Accept") String accept,
             Context context);
 
-        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> createOrReplace(@HostParam("endpoint") String endpoint,
@@ -93,7 +92,7 @@ Mono<Response<Flux<ByteBuffer>>> createOrReplace(@HostParam("endpoint") String e
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") NestedProxyResourceInner resource, Context context);
 
-        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
@@ -105,7 +104,7 @@ Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
             @BodyParam("application/json") NestedProxyResourceInner properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources/{nextedProxyResourceName}")
         @ExpectedResponses({ 202, 204 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
@@ -116,7 +115,7 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/nestedProxyResources")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<NestedProxyResourceListResult>> listByTopLevelTrackedResource(
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedsImpl.java
similarity index 89%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourcesImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedsImpl.java
index a4e6bff887..6a137a3f4b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/NestedProxyResourcesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/NestedsImpl.java
@@ -2,27 +2,26 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.resources.fluent.NestedProxyResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResource;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResources;
+import com.azure.resourcemanager.resources.fluent.NestedsClient;
+import com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner;
+import com.azure.resourcemanager.resources.models.NestedProxyResource;
+import com.azure.resourcemanager.resources.models.Nesteds;
 
-public final class NestedProxyResourcesImpl implements NestedProxyResources {
-    private static final ClientLogger LOGGER = new ClientLogger(NestedProxyResourcesImpl.class);
+public final class NestedsImpl implements Nesteds {
+    private static final ClientLogger LOGGER = new ClientLogger(NestedsImpl.class);
 
-    private final NestedProxyResourcesClient innerClient;
+    private final NestedsClient innerClient;
 
-    private final com.azure.resourcemanager.models.resources.ResourcesManager serviceManager;
+    private final com.azure.resourcemanager.resources.ResourcesManager serviceManager;
 
-    public NestedProxyResourcesImpl(NestedProxyResourcesClient innerClient,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+    public NestedsImpl(NestedsClient innerClient, com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -151,11 +150,11 @@ public void deleteByIdWithResponse(String id, Context context) {
         this.delete(resourceGroupName, topLevelTrackedResourceName, nextedProxyResourceName, context);
     }
 
-    private NestedProxyResourcesClient serviceClient() {
+    private NestedsClient serviceClient() {
         return this.innerClient;
     }
 
-    private com.azure.resourcemanager.models.resources.ResourcesManager manager() {
+    private com.azure.resourcemanager.resources.ResourcesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ResourceManagerUtils.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceManagerUtils.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ResourceManagerUtils.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceManagerUtils.java
index b3e07f6cf3..fdaafefe97 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/commontypes/managedidentity/implementation/ResourceManagerUtils.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceManagerUtils.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.http.rest.PagedFlux;
 import com.azure.core.http.rest.PagedIterable;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourcesClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourcesClientBuilder.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourcesClientBuilder.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourcesClientBuilder.java
index 0e78a1b9e2..510b8ab273 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourcesClientBuilder.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourcesClientBuilder.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.annotation.ServiceClientBuilder;
 import com.azure.core.http.HttpPipeline;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourcesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourcesClientImpl.java
similarity index 83%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourcesClientImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourcesClientImpl.java
index dfaab4abe7..ec6012d99d 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/ResourcesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/ResourcesClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.annotation.ServiceClient;
 import com.azure.core.http.HttpHeaderName;
@@ -23,10 +23,10 @@
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.core.util.serializer.SerializerEncoding;
-import com.azure.resourcemanager.models.resources.fluent.NestedProxyResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.ResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.SingletonTrackedResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.TopLevelTrackedResourcesClient;
+import com.azure.resourcemanager.resources.fluent.NestedsClient;
+import com.azure.resourcemanager.resources.fluent.ResourcesClient;
+import com.azure.resourcemanager.resources.fluent.SingletonsClient;
+import com.azure.resourcemanager.resources.fluent.TopLevelsClient;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
@@ -126,45 +126,45 @@ public Duration getDefaultPollInterval() {
     }
 
     /**
-     * The TopLevelTrackedResourcesClient object to access its operations.
+     * The TopLevelsClient object to access its operations.
      */
-    private final TopLevelTrackedResourcesClient topLevelTrackedResources;
+    private final TopLevelsClient topLevels;
 
     /**
-     * Gets the TopLevelTrackedResourcesClient object to access its operations.
+     * Gets the TopLevelsClient object to access its operations.
      * 
-     * @return the TopLevelTrackedResourcesClient object.
+     * @return the TopLevelsClient object.
      */
-    public TopLevelTrackedResourcesClient getTopLevelTrackedResources() {
-        return this.topLevelTrackedResources;
+    public TopLevelsClient getTopLevels() {
+        return this.topLevels;
     }
 
     /**
-     * The NestedProxyResourcesClient object to access its operations.
+     * The NestedsClient object to access its operations.
      */
-    private final NestedProxyResourcesClient nestedProxyResources;
+    private final NestedsClient nesteds;
 
     /**
-     * Gets the NestedProxyResourcesClient object to access its operations.
+     * Gets the NestedsClient object to access its operations.
      * 
-     * @return the NestedProxyResourcesClient object.
+     * @return the NestedsClient object.
      */
-    public NestedProxyResourcesClient getNestedProxyResources() {
-        return this.nestedProxyResources;
+    public NestedsClient getNesteds() {
+        return this.nesteds;
     }
 
     /**
-     * The SingletonTrackedResourcesClient object to access its operations.
+     * The SingletonsClient object to access its operations.
      */
-    private final SingletonTrackedResourcesClient singletonTrackedResources;
+    private final SingletonsClient singletons;
 
     /**
-     * Gets the SingletonTrackedResourcesClient object to access its operations.
+     * Gets the SingletonsClient object to access its operations.
      * 
-     * @return the SingletonTrackedResourcesClient object.
+     * @return the SingletonsClient object.
      */
-    public SingletonTrackedResourcesClient getSingletonTrackedResources() {
-        return this.singletonTrackedResources;
+    public SingletonsClient getSingletons() {
+        return this.singletons;
     }
 
     /**
@@ -185,9 +185,9 @@ public SingletonTrackedResourcesClient getSingletonTrackedResources() {
         this.endpoint = endpoint;
         this.subscriptionId = subscriptionId;
         this.apiVersion = "2023-12-01-preview";
-        this.topLevelTrackedResources = new TopLevelTrackedResourcesClientImpl(this);
-        this.nestedProxyResources = new NestedProxyResourcesClientImpl(this);
-        this.singletonTrackedResources = new SingletonTrackedResourcesClientImpl(this);
+        this.topLevels = new TopLevelsClientImpl(this);
+        this.nesteds = new NestedsClientImpl(this);
+        this.singletons = new SingletonsClientImpl(this);
     }
 
     /**
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourceImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonTrackedResourceImpl.java
similarity index 71%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourceImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonTrackedResourceImpl.java
index b83d8f1489..f6b557f183 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourceImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonTrackedResourceImpl.java
@@ -2,22 +2,22 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.management.SystemData;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.models.SingletonTrackedResource;
-import com.azure.resourcemanager.models.resources.models.SingletonTrackedResourceProperties;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.models.SingletonTrackedResource;
+import com.azure.resourcemanager.resources.models.SingletonTrackedResourceProperties;
 import java.util.Collections;
 import java.util.Map;
 
 public final class SingletonTrackedResourceImpl implements SingletonTrackedResource {
     private SingletonTrackedResourceInner innerObject;
 
-    private final com.azure.resourcemanager.models.resources.ResourcesManager serviceManager;
+    private final com.azure.resourcemanager.resources.ResourcesManager serviceManager;
 
     SingletonTrackedResourceImpl(SingletonTrackedResourceInner innerObject,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+        com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -59,7 +59,7 @@ public SingletonTrackedResourceInner innerModel() {
         return this.innerObject;
     }
 
-    private com.azure.resourcemanager.models.resources.ResourcesManager manager() {
+    private com.azure.resourcemanager.resources.ResourcesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourcesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonsClientImpl.java
similarity index 96%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourcesClientImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonsClientImpl.java
index f0a6d176b6..ff8ce928c9 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourcesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonsClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.ExpectedResponses;
@@ -31,21 +31,21 @@
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
-import com.azure.resourcemanager.models.resources.fluent.SingletonTrackedResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.implementation.models.SingletonTrackedResourceListResult;
+import com.azure.resourcemanager.resources.fluent.SingletonsClient;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.implementation.models.SingletonTrackedResourceListResult;
 import java.nio.ByteBuffer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * An instance of this class provides access to all the operations defined in SingletonTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in SingletonsClient.
  */
-public final class SingletonTrackedResourcesClientImpl implements SingletonTrackedResourcesClient {
+public final class SingletonsClientImpl implements SingletonsClient {
     /**
      * The proxy service used to perform REST calls.
      */
-    private final SingletonTrackedResourcesService service;
+    private final SingletonsService service;
 
     /**
      * The service client containing this operation class.
@@ -53,25 +53,25 @@ public final class SingletonTrackedResourcesClientImpl implements SingletonTrack
     private final ResourcesClientImpl client;
 
     /**
-     * Initializes an instance of SingletonTrackedResourcesClientImpl.
+     * Initializes an instance of SingletonsClientImpl.
      * 
      * @param client the instance of the service client containing this operation class.
      */
-    SingletonTrackedResourcesClientImpl(ResourcesClientImpl client) {
-        this.service = RestProxy.create(SingletonTrackedResourcesService.class, client.getHttpPipeline(),
-            client.getSerializerAdapter());
+    SingletonsClientImpl(ResourcesClientImpl client) {
+        this.service
+            = RestProxy.create(SingletonsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
         this.client = client;
     }
 
     /**
-     * The interface defining all the services for ResourcesClientSingletonTrackedResources to be used by the proxy
-     * service to perform REST calls.
+     * The interface defining all the services for ResourcesClientSingletons to be used by the proxy service to perform
+     * REST calls.
      */
     @Host("{endpoint}")
     @ServiceInterface(name = "ResourcesClientSingl")
-    public interface SingletonTrackedResourcesService {
+    public interface SingletonsService {
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<SingletonTrackedResourceInner>> getByResourceGroup(@HostParam("endpoint") String endpoint,
@@ -79,7 +79,7 @@ Mono<Response<SingletonTrackedResourceInner>> getByResourceGroup(@HostParam("end
             @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
-        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default")
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("endpoint") String endpoint,
@@ -88,7 +88,7 @@ Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("endpoint") String en
             @HeaderParam("Accept") String accept, @BodyParam("application/json") SingletonTrackedResourceInner resource,
             Context context);
 
-        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources/default")
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources/default")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<SingletonTrackedResourceInner>> update(@HostParam("endpoint") String endpoint,
@@ -98,7 +98,7 @@ Mono<Response<SingletonTrackedResourceInner>> update(@HostParam("endpoint") Stri
             @BodyParam("application/json") SingletonTrackedResourceInner properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/singletonTrackedResources")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/singletonTrackedResources")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<SingletonTrackedResourceListResult>> listByResourceGroup(@HostParam("endpoint") String endpoint,
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonsImpl.java
similarity index 79%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourcesImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonsImpl.java
index 8e6424cb30..94adad1f22 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/SingletonTrackedResourcesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/SingletonsImpl.java
@@ -2,27 +2,27 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.resources.fluent.SingletonTrackedResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.models.SingletonTrackedResource;
-import com.azure.resourcemanager.models.resources.models.SingletonTrackedResources;
+import com.azure.resourcemanager.resources.fluent.SingletonsClient;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.models.SingletonTrackedResource;
+import com.azure.resourcemanager.resources.models.Singletons;
 
-public final class SingletonTrackedResourcesImpl implements SingletonTrackedResources {
-    private static final ClientLogger LOGGER = new ClientLogger(SingletonTrackedResourcesImpl.class);
+public final class SingletonsImpl implements Singletons {
+    private static final ClientLogger LOGGER = new ClientLogger(SingletonsImpl.class);
 
-    private final SingletonTrackedResourcesClient innerClient;
+    private final SingletonsClient innerClient;
 
-    private final com.azure.resourcemanager.models.resources.ResourcesManager serviceManager;
+    private final com.azure.resourcemanager.resources.ResourcesManager serviceManager;
 
-    public SingletonTrackedResourcesImpl(SingletonTrackedResourcesClient innerClient,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+    public SingletonsImpl(SingletonsClient innerClient,
+        com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -100,11 +100,11 @@ public PagedIterable<SingletonTrackedResource> listByResourceGroup(String resour
         return ResourceManagerUtils.mapPage(inner, inner1 -> new SingletonTrackedResourceImpl(inner1, this.manager()));
     }
 
-    private SingletonTrackedResourcesClient serviceClient() {
+    private SingletonsClient serviceClient() {
         return this.innerClient;
     }
 
-    private com.azure.resourcemanager.models.resources.ResourcesManager manager() {
+    private com.azure.resourcemanager.resources.ResourcesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourceImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelTrackedResourceImpl.java
similarity index 80%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourceImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelTrackedResourceImpl.java
index 19769a43b1..22301b5eba 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourceImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelTrackedResourceImpl.java
@@ -2,16 +2,16 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.http.rest.Response;
 import com.azure.core.management.Region;
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.models.NotificationDetails;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResource;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResourceProperties;
+import com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner;
+import com.azure.resourcemanager.resources.models.NotificationDetails;
+import com.azure.resourcemanager.resources.models.TopLevelTrackedResource;
+import com.azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties;
 import java.util.Collections;
 import java.util.Map;
 
@@ -19,7 +19,7 @@ public final class TopLevelTrackedResourceImpl
     implements TopLevelTrackedResource, TopLevelTrackedResource.Definition, TopLevelTrackedResource.Update {
     private TopLevelTrackedResourceInner innerObject;
 
-    private final com.azure.resourcemanager.models.resources.ResourcesManager serviceManager;
+    private final com.azure.resourcemanager.resources.ResourcesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -70,7 +70,7 @@ public TopLevelTrackedResourceInner innerModel() {
         return this.innerObject;
     }
 
-    private com.azure.resourcemanager.models.resources.ResourcesManager manager() {
+    private com.azure.resourcemanager.resources.ResourcesManager manager() {
         return this.serviceManager;
     }
 
@@ -85,20 +85,19 @@ public TopLevelTrackedResourceImpl withExistingResourceGroup(String resourceGrou
 
     public TopLevelTrackedResource create() {
         this.innerObject = serviceManager.serviceClient()
-            .getTopLevelTrackedResources()
+            .getTopLevels()
             .createOrReplace(resourceGroupName, topLevelTrackedResourceName, this.innerModel(), Context.NONE);
         return this;
     }
 
     public TopLevelTrackedResource create(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getTopLevelTrackedResources()
+            .getTopLevels()
             .createOrReplace(resourceGroupName, topLevelTrackedResourceName, this.innerModel(), context);
         return this;
     }
 
-    TopLevelTrackedResourceImpl(String name,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+    TopLevelTrackedResourceImpl(String name, com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerObject = new TopLevelTrackedResourceInner();
         this.serviceManager = serviceManager;
         this.topLevelTrackedResourceName = name;
@@ -110,20 +109,20 @@ public TopLevelTrackedResourceImpl update() {
 
     public TopLevelTrackedResource apply() {
         this.innerObject = serviceManager.serviceClient()
-            .getTopLevelTrackedResources()
+            .getTopLevels()
             .update(resourceGroupName, topLevelTrackedResourceName, this.innerModel(), Context.NONE);
         return this;
     }
 
     public TopLevelTrackedResource apply(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getTopLevelTrackedResources()
+            .getTopLevels()
             .update(resourceGroupName, topLevelTrackedResourceName, this.innerModel(), context);
         return this;
     }
 
     TopLevelTrackedResourceImpl(TopLevelTrackedResourceInner innerObject,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+        com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
@@ -133,7 +132,7 @@ public TopLevelTrackedResource apply(Context context) {
 
     public TopLevelTrackedResource refresh() {
         this.innerObject = serviceManager.serviceClient()
-            .getTopLevelTrackedResources()
+            .getTopLevels()
             .getByResourceGroupWithResponse(resourceGroupName, topLevelTrackedResourceName, Context.NONE)
             .getValue();
         return this;
@@ -141,19 +140,19 @@ public TopLevelTrackedResource refresh() {
 
     public TopLevelTrackedResource refresh(Context context) {
         this.innerObject = serviceManager.serviceClient()
-            .getTopLevelTrackedResources()
+            .getTopLevels()
             .getByResourceGroupWithResponse(resourceGroupName, topLevelTrackedResourceName, context)
             .getValue();
         return this;
     }
 
     public Response<Void> actionSyncWithResponse(NotificationDetails body, Context context) {
-        return serviceManager.topLevelTrackedResources()
+        return serviceManager.topLevels()
             .actionSyncWithResponse(resourceGroupName, topLevelTrackedResourceName, body, context);
     }
 
     public void actionSync(NotificationDetails body) {
-        serviceManager.topLevelTrackedResources().actionSync(resourceGroupName, topLevelTrackedResourceName, body);
+        serviceManager.topLevels().actionSync(resourceGroupName, topLevelTrackedResourceName, body);
     }
 
     public TopLevelTrackedResourceImpl withRegion(Region location) {
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourcesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelsClientImpl.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourcesClientImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelsClientImpl.java
index 8a6a1ebba4..6b8274f60e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourcesClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelsClientImpl.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.Delete;
@@ -33,22 +33,22 @@
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
-import com.azure.resourcemanager.models.resources.fluent.TopLevelTrackedResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.implementation.models.TopLevelTrackedResourceListResult;
-import com.azure.resourcemanager.models.resources.models.NotificationDetails;
+import com.azure.resourcemanager.resources.fluent.TopLevelsClient;
+import com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner;
+import com.azure.resourcemanager.resources.implementation.models.TopLevelTrackedResourceListResult;
+import com.azure.resourcemanager.resources.models.NotificationDetails;
 import java.nio.ByteBuffer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * An instance of this class provides access to all the operations defined in TopLevelTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in TopLevelsClient.
  */
-public final class TopLevelTrackedResourcesClientImpl implements TopLevelTrackedResourcesClient {
+public final class TopLevelsClientImpl implements TopLevelsClient {
     /**
      * The proxy service used to perform REST calls.
      */
-    private final TopLevelTrackedResourcesService service;
+    private final TopLevelsService service;
 
     /**
      * The service client containing this operation class.
@@ -56,25 +56,25 @@ public final class TopLevelTrackedResourcesClientImpl implements TopLevelTracked
     private final ResourcesClientImpl client;
 
     /**
-     * Initializes an instance of TopLevelTrackedResourcesClientImpl.
+     * Initializes an instance of TopLevelsClientImpl.
      * 
      * @param client the instance of the service client containing this operation class.
      */
-    TopLevelTrackedResourcesClientImpl(ResourcesClientImpl client) {
-        this.service = RestProxy.create(TopLevelTrackedResourcesService.class, client.getHttpPipeline(),
-            client.getSerializerAdapter());
+    TopLevelsClientImpl(ResourcesClientImpl client) {
+        this.service
+            = RestProxy.create(TopLevelsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
         this.client = client;
     }
 
     /**
-     * The interface defining all the services for ResourcesClientTopLevelTrackedResources to be used by the proxy
-     * service to perform REST calls.
+     * The interface defining all the services for ResourcesClientTopLevels to be used by the proxy service to perform
+     * REST calls.
      */
     @Host("{endpoint}")
     @ServiceInterface(name = "ResourcesClientTopLe")
-    public interface TopLevelTrackedResourcesService {
+    public interface TopLevelsService {
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<TopLevelTrackedResourceInner>> getByResourceGroup(@HostParam("endpoint") String endpoint,
@@ -83,7 +83,7 @@ Mono<Response<TopLevelTrackedResourceInner>> getByResourceGroup(@HostParam("endp
             @PathParam("topLevelTrackedResourceName") String topLevelTrackedResourceName,
             @HeaderParam("Accept") String accept, Context context);
 
-        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> createOrReplace(@HostParam("endpoint") String endpoint,
@@ -93,7 +93,7 @@ Mono<Response<Flux<ByteBuffer>>> createOrReplace(@HostParam("endpoint") String e
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") TopLevelTrackedResourceInner resource, Context context);
 
-        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
@@ -104,7 +104,7 @@ Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
             @BodyParam("application/json") TopLevelTrackedResourceInner properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}")
         @ExpectedResponses({ 202, 204 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
@@ -114,7 +114,7 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources")
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<TopLevelTrackedResourceListResult>> listByResourceGroup(@HostParam("endpoint") String endpoint,
@@ -123,14 +123,14 @@ Mono<Response<TopLevelTrackedResourceListResult>> listByResourceGroup(@HostParam
             Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Get("/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources")
+        @Get("/subscriptions/{subscriptionId}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<TopLevelTrackedResourceListResult>> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
-        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync")
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/{topLevelTrackedResourceName}/actionSync")
         @ExpectedResponses({ 204 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<Void>> actionSync(@HostParam("endpoint") String endpoint,
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourcesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelsImpl.java
similarity index 87%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourcesImpl.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelsImpl.java
index db68099488..3d6cbd0e2f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/TopLevelTrackedResourcesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/TopLevelsImpl.java
@@ -2,28 +2,28 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.resources.fluent.TopLevelTrackedResourcesClient;
-import com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner;
-import com.azure.resourcemanager.models.resources.models.NotificationDetails;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResource;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResources;
+import com.azure.resourcemanager.resources.fluent.TopLevelsClient;
+import com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner;
+import com.azure.resourcemanager.resources.models.NotificationDetails;
+import com.azure.resourcemanager.resources.models.TopLevelTrackedResource;
+import com.azure.resourcemanager.resources.models.TopLevels;
 
-public final class TopLevelTrackedResourcesImpl implements TopLevelTrackedResources {
-    private static final ClientLogger LOGGER = new ClientLogger(TopLevelTrackedResourcesImpl.class);
+public final class TopLevelsImpl implements TopLevels {
+    private static final ClientLogger LOGGER = new ClientLogger(TopLevelsImpl.class);
 
-    private final TopLevelTrackedResourcesClient innerClient;
+    private final TopLevelsClient innerClient;
 
-    private final com.azure.resourcemanager.models.resources.ResourcesManager serviceManager;
+    private final com.azure.resourcemanager.resources.ResourcesManager serviceManager;
 
-    public TopLevelTrackedResourcesImpl(TopLevelTrackedResourcesClient innerClient,
-        com.azure.resourcemanager.models.resources.ResourcesManager serviceManager) {
+    public TopLevelsImpl(TopLevelsClient innerClient,
+        com.azure.resourcemanager.resources.ResourcesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -146,11 +146,11 @@ public void deleteByIdWithResponse(String id, Context context) {
         this.delete(resourceGroupName, topLevelTrackedResourceName, context);
     }
 
-    private TopLevelTrackedResourcesClient serviceClient() {
+    private TopLevelsClient serviceClient() {
         return this.innerClient;
     }
 
-    private com.azure.resourcemanager.models.resources.ResourcesManager manager() {
+    private com.azure.resourcemanager.resources.ResourcesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/NestedProxyResourceListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/NestedProxyResourceListResult.java
similarity index 95%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/NestedProxyResourceListResult.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/NestedProxyResourceListResult.java
index aeaa5f02a2..cedccfbcea 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/NestedProxyResourceListResult.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/NestedProxyResourceListResult.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation.models;
+package com.azure.resourcemanager.resources.implementation.models;
 
 import com.azure.core.annotation.Immutable;
 import com.azure.core.util.logging.ClientLogger;
@@ -10,7 +10,7 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner;
 import java.io.IOException;
 import java.util.List;
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/SingletonTrackedResourceListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/SingletonTrackedResourceListResult.java
similarity index 95%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/SingletonTrackedResourceListResult.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/SingletonTrackedResourceListResult.java
index b813e26993..1ab7e005cc 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/SingletonTrackedResourceListResult.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/SingletonTrackedResourceListResult.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation.models;
+package com.azure.resourcemanager.resources.implementation.models;
 
 import com.azure.core.annotation.Immutable;
 import com.azure.core.util.logging.ClientLogger;
@@ -10,7 +10,7 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
 import java.io.IOException;
 import java.util.List;
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/TopLevelTrackedResourceListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/TopLevelTrackedResourceListResult.java
similarity index 95%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/TopLevelTrackedResourceListResult.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/TopLevelTrackedResourceListResult.java
index 6d724dd991..e1d3dca965 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/models/TopLevelTrackedResourceListResult.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/models/TopLevelTrackedResourceListResult.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.implementation.models;
+package com.azure.resourcemanager.resources.implementation.models;
 
 import com.azure.core.annotation.Immutable;
 import com.azure.core.util.logging.ClientLogger;
@@ -10,7 +10,7 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner;
 import java.io.IOException;
 import java.util.List;
 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/package-info.java
similarity index 79%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/package-info.java
index f3180da151..1b68e65828 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/implementation/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/implementation/package-info.java
@@ -6,4 +6,4 @@
  * Package containing the implementations for Resources.
  * Arm Resource Provider management API.
  */
-package com.azure.resourcemanager.models.resources.implementation;
+package com.azure.resourcemanager.resources.implementation;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResource.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NestedProxyResource.java
similarity index 95%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResource.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NestedProxyResource.java
index b83c6f9d01..5d12d7fe54 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResource.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NestedProxyResource.java
@@ -2,11 +2,11 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner;
 
 /**
  * An immutable client-side representation of NestedProxyResource.
@@ -55,7 +55,7 @@ public interface NestedProxyResource {
     String resourceGroupName();
 
     /**
-     * Gets the inner com.azure.resourcemanager.models.resources.fluent.models.NestedProxyResourceInner object.
+     * Gets the inner com.azure.resourcemanager.resources.fluent.models.NestedProxyResourceInner object.
      * 
      * @return the inner object.
      */
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResourceProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NestedProxyResourceProperties.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResourceProperties.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NestedProxyResourceProperties.java
index e6c1fff680..6947cfa684 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResourceProperties.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NestedProxyResourceProperties.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResources.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/Nesteds.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResources.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/Nesteds.java
index 36603839d6..217f069bd8 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NestedProxyResources.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/Nesteds.java
@@ -2,16 +2,16 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 
 /**
- * Resource collection API of NestedProxyResources.
+ * Resource collection API of Nesteds.
  */
-public interface NestedProxyResources {
+public interface Nesteds {
     /**
      * Get a NestedProxyResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NotificationDetails.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NotificationDetails.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NotificationDetails.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NotificationDetails.java
index 2eda9286b5..a8a475f73c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/NotificationDetails.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/NotificationDetails.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.logging.ClientLogger;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/ProvisioningState.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/ProvisioningState.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/ProvisioningState.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/ProvisioningState.java
index 7876e51d66..226b38f7c4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/ProvisioningState.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/ProvisioningState.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.util.ExpandableStringEnum;
 import java.util.Collection;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResource.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/SingletonTrackedResource.java
similarity index 85%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResource.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/SingletonTrackedResource.java
index 07a7d955cb..06efbb1335 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResource.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/SingletonTrackedResource.java
@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.management.SystemData;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
 import java.util.Map;
 
 /**
@@ -62,7 +62,7 @@ public interface SingletonTrackedResource {
     SystemData systemData();
 
     /**
-     * Gets the inner com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner object.
+     * Gets the inner com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner object.
      * 
      * @return the inner object.
      */
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResourceProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/SingletonTrackedResourceProperties.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResourceProperties.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/SingletonTrackedResourceProperties.java
index ab743822d5..34f5891584 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResourceProperties.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/SingletonTrackedResourceProperties.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResources.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/Singletons.java
similarity index 96%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResources.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/Singletons.java
index ba3c61592e..d9872d0b57 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/SingletonTrackedResources.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/Singletons.java
@@ -2,17 +2,17 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.resources.fluent.models.SingletonTrackedResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.SingletonTrackedResourceInner;
 
 /**
- * Resource collection API of SingletonTrackedResources.
+ * Resource collection API of Singletons.
  */
-public interface SingletonTrackedResources {
+public interface Singletons {
     /**
      * Get a SingletonTrackedResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResource.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevelTrackedResource.java
similarity index 97%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResource.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevelTrackedResource.java
index bdbbfbba55..caaafbcb38 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResource.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevelTrackedResource.java
@@ -2,13 +2,13 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.http.rest.Response;
 import com.azure.core.management.Region;
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner;
+import com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner;
 import java.util.Map;
 
 /**
@@ -86,7 +86,7 @@ public interface TopLevelTrackedResource {
     String resourceGroupName();
 
     /**
-     * Gets the inner com.azure.resourcemanager.models.resources.fluent.models.TopLevelTrackedResourceInner object.
+     * Gets the inner com.azure.resourcemanager.resources.fluent.models.TopLevelTrackedResourceInner object.
      * 
      * @return the inner object.
      */
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResourceProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevelTrackedResourceProperties.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResourceProperties.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevelTrackedResourceProperties.java
index 44b1e5f9fc..8c2e935a5b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResourceProperties.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevelTrackedResourceProperties.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResources.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevels.java
similarity index 98%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResources.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevels.java
index 0fa611cf4a..181c84cf1c 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/TopLevelTrackedResources.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/TopLevels.java
@@ -2,16 +2,16 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
 
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 
 /**
- * Resource collection API of TopLevelTrackedResources.
+ * Resource collection API of TopLevels.
  */
-public interface TopLevelTrackedResources {
+public interface TopLevels {
     /**
      * Get a TopLevelTrackedResource.
      * 
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/package-info.java
similarity index 81%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/package-info.java
index 01322e3cf6..14baab305f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/models/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/models/package-info.java
@@ -6,4 +6,4 @@
  * Package containing the data models for Resources.
  * Arm Resource Provider management API.
  */
-package com.azure.resourcemanager.models.resources.models;
+package com.azure.resourcemanager.resources.models;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/package-info.java
similarity index 83%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/package-info.java
rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/package-info.java
index 6577484401..1b1458926f 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/models/resources/package-info.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/azure/resourcemanager/resources/package-info.java
@@ -6,4 +6,4 @@
  * Package containing the classes for Resources.
  * Arm Resource Provider management API.
  */
-package com.azure.resourcemanager.models.resources;
+package com.azure.resourcemanager.resources;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-commonproperties/proxy-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-commonproperties/proxy-config.json
new file mode 100644
index 0000000000..7460c05599
--- /dev/null
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-commonproperties/proxy-config.json
@@ -0,0 +1 @@
+[["com.azure.resourcemanager.commonproperties.implementation.ManagedIdentitiesClientImpl$ManagedIdentitiesService"]]
\ No newline at end of file
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-commontypes-managedidentity/reflect-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-commonproperties/reflect-config.json
similarity index 100%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-commontypes-managedidentity/reflect-config.json
rename to packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-commonproperties/reflect-config.json
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-commontypes-managedidentity/proxy-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-commontypes-managedidentity/proxy-config.json
deleted file mode 100644
index f5b57f4900..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-commontypes-managedidentity/proxy-config.json
+++ /dev/null
@@ -1 +0,0 @@
-[["com.azure.resourcemanager.models.commontypes.managedidentity.implementation.ManagedIdentityTrackedResourcesClientImpl$ManagedIdentityTrackedResourcesService"]]
\ No newline at end of file
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-resources/proxy-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-resources/proxy-config.json
deleted file mode 100644
index f65f2e8854..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-resources/proxy-config.json
+++ /dev/null
@@ -1 +0,0 @@
-[["com.azure.resourcemanager.models.resources.implementation.NestedProxyResourcesClientImpl$NestedProxyResourcesService"],["com.azure.resourcemanager.models.resources.implementation.SingletonTrackedResourcesClientImpl$SingletonTrackedResourcesService"],["com.azure.resourcemanager.models.resources.implementation.TopLevelTrackedResourcesClientImpl$TopLevelTrackedResourcesService"]]
\ No newline at end of file
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-resources/proxy-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-resources/proxy-config.json
new file mode 100644
index 0000000000..aa7e5a34ca
--- /dev/null
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-resources/proxy-config.json
@@ -0,0 +1 @@
+[["com.azure.resourcemanager.resources.implementation.NestedsClientImpl$NestedsService"],["com.azure.resourcemanager.resources.implementation.SingletonsClientImpl$SingletonsService"],["com.azure.resourcemanager.resources.implementation.TopLevelsClientImpl$TopLevelsService"]]
\ No newline at end of file
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-resources/reflect-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-resources/reflect-config.json
similarity index 100%
rename from packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-models-resources/reflect-config.json
rename to packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-resources/reflect-config.json
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/models/commontypes/managedidentity/ManagedIdentityManagerTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/commonproperties/ManagedIdentityManagerTests.java
similarity index 76%
rename from packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/models/commontypes/managedidentity/ManagedIdentityManagerTests.java
rename to packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/commonproperties/ManagedIdentityManagerTests.java
index 662048094b..af9fa81ec0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/models/commontypes/managedidentity/ManagedIdentityManagerTests.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/commonproperties/ManagedIdentityManagerTests.java
@@ -1,16 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity;
+package com.azure.resourcemanager.commonproperties;
 
 import com.azure.core.management.Region;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResource;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResourceProperties;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedServiceIdentity;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedServiceIdentityType;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.UserAssignedIdentity;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResource;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties;
+import com.azure.resourcemanager.commonproperties.models.ManagedServiceIdentity;
+import com.azure.resourcemanager.commonproperties.models.ManagedServiceIdentityType;
+import com.azure.resourcemanager.commonproperties.models.UserAssignedIdentity;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.utils.ArmUtils;
@@ -18,14 +19,14 @@
 public class ManagedIdentityManagerTests {
     private static final String USER_ASSIGNED_IDENTITIES_KEY
         = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1";
-    private final ManagedIdentityManager manager
-        = ManagedIdentityManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile());
+    private final CommonPropertiesManager manager
+        = CommonPropertiesManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile());
 
     @Test
     public void testManagedIdentityManager() {
         Map<String, String> tagsMap = new HashMap<>();
         tagsMap.put("tagKey1", "tagValue1");
-        ManagedIdentityTrackedResource resource = manager.managedIdentityTrackedResources()
+        ManagedIdentityTrackedResource resource = manager.managedIdentities()
             .define("identity")
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup("test-rg")
@@ -37,7 +38,7 @@ public void testManagedIdentityManager() {
         Assertions.assertNotNull(resource.identity().principalId());
         Assertions.assertNotNull(resource.identity().tenantId());
 
-        resource = manager.managedIdentityTrackedResources().getById(resource.id());
+        resource = manager.managedIdentities().getById(resource.id());
         Assertions.assertEquals(ManagedServiceIdentityType.SYSTEM_ASSIGNED, resource.identity().type());
         Assertions.assertNotNull(resource.identity().principalId());
         Assertions.assertNotNull(resource.identity().tenantId());
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/models/resources/ArmResourceTest.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/resources/ArmResourceTest.java
similarity index 87%
rename from packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/models/resources/ArmResourceTest.java
rename to packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/resources/ArmResourceTest.java
index 586e054eb7..dc34e08c29 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/models/resources/ArmResourceTest.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/resourcemanager/resources/ArmResourceTest.java
@@ -1,33 +1,34 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.resourcemanager.models.resources;
+package com.azure.resourcemanager.resources;
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResource;
-import com.azure.resourcemanager.models.resources.models.NestedProxyResourceProperties;
-import com.azure.resourcemanager.models.resources.models.NotificationDetails;
-import com.azure.resourcemanager.models.resources.models.ProvisioningState;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResource;
-import com.azure.resourcemanager.models.resources.models.TopLevelTrackedResourceProperties;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.azure.resourcemanager.resources.models.NestedProxyResource;
+import com.azure.resourcemanager.resources.models.NestedProxyResourceProperties;
+import com.azure.resourcemanager.resources.models.NotificationDetails;
+import com.azure.resourcemanager.resources.models.ProvisioningState;
+import com.azure.resourcemanager.resources.models.TopLevelTrackedResource;
+import com.azure.resourcemanager.resources.models.TopLevelTrackedResourceProperties;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.utils.ArmUtils;
 
 public class ArmResourceTest {
     private static final String TOP_LEVEL_TRACKED_RESOURCE_ID
-        = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top";
+        = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/top";
     private static final String TOP_LEVEL_TRACKED_RESOURCE_NAME = "top";
     private static final String TOP_LEVEL_TRACKED_RESOURCE_TYPE
-        = "Azure.ResourceManager.Models.Resources/topLevelTrackedResources";
+        = "Azure.ResourceManager.Resources/topLevelTrackedResources";
     private static final String NESTED_PROXY_RESOURCE_ID
-        = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources/nested";
+        = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources/nested";
     private static final String NESTED_PROXY_RESOURCE_NAME = "nested";
     private static final String NESTED_PROXY_RESOURCE_TYPE
-        = "Azure.ResourceManager.Models.Resources/topLevelTrackedResources/top/nestedProxyResources";
+        = "Azure.ResourceManager.Resources/topLevelTrackedResources/top/nestedProxyResources";
     private static final Region TOP_LEVEL_TRACKED_RESOURCE_REGION = Region.US_EAST;
     private static final String RESOURCE_DESCRIPTION_VALID = "valid";
     private static final String RESOURCE_DESCRIPTION_VALID2 = "valid2";
@@ -40,7 +41,7 @@ public class ArmResourceTest {
     @Test
     public void testTopLevelTrackedResource() {
         // TopLevelTrackedResources.createOrReplace
-        TopLevelTrackedResource topLevelTrackedResource = manager.topLevelTrackedResources()
+        TopLevelTrackedResource topLevelTrackedResource = manager.topLevels()
             .define(TOP_LEVEL_TRACKED_RESOURCE_NAME)
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(RESOURCE_GROUP_NAME)
@@ -54,7 +55,7 @@ public void testTopLevelTrackedResource() {
         Assertions.assertEquals(RESOURCE_DESCRIPTION_VALID, topLevelTrackedResource.properties().description());
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, topLevelTrackedResource.properties().provisioningState());
 
-        manager.topLevelTrackedResources()
+        manager.topLevels()
             .actionSync(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME,
                 new NotificationDetails().withMessage(NOTIFICATION_DETAILS_MESSAGE).withUrgent(true));
 
@@ -62,7 +63,7 @@ public void testTopLevelTrackedResource() {
             .actionSync(new NotificationDetails().withMessage(NOTIFICATION_DETAILS_MESSAGE).withUrgent(true));
 
         // TopLevelTrackedResources.listByResourceGroup
-        List<TopLevelTrackedResource> topLevelTrackedResourceList = manager.topLevelTrackedResources()
+        List<TopLevelTrackedResource> topLevelTrackedResourceList = manager.topLevels()
             .listByResourceGroup(RESOURCE_GROUP_NAME)
             .stream()
             .collect(Collectors.toList());
@@ -77,7 +78,7 @@ public void testTopLevelTrackedResource() {
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, topLevelTrackedResource.properties().provisioningState());
 
         // TopLevelTrackedResources.listBySubscription
-        topLevelTrackedResourceList = manager.topLevelTrackedResources()
+        topLevelTrackedResourceList = manager.topLevels()
             .list()
             .stream()
             .filter(resource -> TOP_LEVEL_TRACKED_RESOURCE_ID.equals(resource.id()))
@@ -93,7 +94,7 @@ public void testTopLevelTrackedResource() {
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, topLevelTrackedResource.properties().provisioningState());
 
         // TopLevelTrackedResources.get
-        topLevelTrackedResource = manager.topLevelTrackedResources()
+        topLevelTrackedResource = manager.topLevels()
             .getByResourceGroup(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME);
         Assertions.assertEquals(TOP_LEVEL_TRACKED_RESOURCE_ID, topLevelTrackedResource.id());
         Assertions.assertEquals(TOP_LEVEL_TRACKED_RESOURCE_NAME, topLevelTrackedResource.name());
@@ -116,13 +117,13 @@ public void testTopLevelTrackedResource() {
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, topLevelTrackedResource.properties().provisioningState());
 
         // TopLevelTrackedResources.delete
-        manager.topLevelTrackedResources().delete(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME, Context.NONE);
+        manager.topLevels().delete(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME, Context.NONE);
     }
 
     @Test
     public void testNestedProxyResource() {
         // NestedProxyResources.createOrReplace
-        NestedProxyResource nestedProxyResource = manager.nestedProxyResources()
+        NestedProxyResource nestedProxyResource = manager.nesteds()
             .define(NESTED_PROXY_RESOURCE_NAME)
             .withExistingTopLevelTrackedResource(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME)
             .withProperties(new NestedProxyResourceProperties().withDescription(RESOURCE_DESCRIPTION_VALID))
@@ -135,7 +136,7 @@ public void testNestedProxyResource() {
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, nestedProxyResource.properties().provisioningState());
 
         // NestedProxyResources.listByTopLevelTrackedResource
-        List<NestedProxyResource> nestedProxyResourceList = manager.nestedProxyResources()
+        List<NestedProxyResource> nestedProxyResourceList = manager.nesteds()
             .listByTopLevelTrackedResource(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME)
             .stream()
             .collect(Collectors.toList());
@@ -149,7 +150,7 @@ public void testNestedProxyResource() {
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, nestedProxyResource.properties().provisioningState());
 
         // NestedProxyResources.get
-        nestedProxyResource = manager.nestedProxyResources()
+        nestedProxyResource = manager.nesteds()
             .get(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME, NESTED_PROXY_RESOURCE_NAME);
         Assertions.assertEquals(NESTED_PROXY_RESOURCE_ID, nestedProxyResource.id());
         Assertions.assertEquals(NESTED_PROXY_RESOURCE_NAME, nestedProxyResource.name());
@@ -170,7 +171,7 @@ public void testNestedProxyResource() {
         Assertions.assertEquals(RESOURCE_PROVISIONING_STATE, nestedProxyResource.properties().provisioningState());
 
         // NestedProxyResources.delete
-        manager.nestedProxyResources()
+        manager.nesteds()
             .delete(RESOURCE_GROUP_NAME, TOP_LEVEL_TRACKED_RESOURCE_NAME, NESTED_PROXY_RESOURCE_NAME);
     }
 }