diff --git a/specification/devcenter/DevCenter/DevBox/routes.tsp b/specification/devcenter/DevCenter/DevBox/routes.tsp
index 6bde7e5c078d..38ff057848ea 100644
--- a/specification/devcenter/DevCenter/DevBox/routes.tsp
+++ b/specification/devcenter/DevCenter/DevBox/routes.tsp
@@ -9,7 +9,7 @@ using TypeSpec.Http;
 
 namespace DevCenterService;
 
-interface DevBoxesOperations {
+interface DevBoxes {
   @doc("Lists available pools")
   listPools is StandardResourceOperations.ResourceList<Pool>;
 
@@ -17,10 +17,10 @@ interface DevBoxesOperations {
   getPool is StandardResourceOperations.ResourceRead<Pool>;
 
   @doc("Lists available schedules for a pool.")
-  listSchedules is StandardResourceOperations.ResourceList<Schedule>;
+  listSchedulesByPool is StandardResourceOperations.ResourceList<Schedule>;
 
   @doc("Gets a schedule.")
-  getSchedule is StandardResourceOperations.ResourceRead<Schedule>;
+  getScheduleByPool is StandardResourceOperations.ResourceRead<Schedule>;
 
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Need of reuse DevBoxListResult"
   // This does fit in the ResourceList<DevBox> but since there are three different operations that returns dev box list result,
@@ -29,7 +29,7 @@ interface DevBoxesOperations {
   @doc("Lists Dev Boxes in the project for a particular user.")
   @route("/projects/{projectName}/users/{userId}/devboxes")
   @get
-  listDevBoxes is Azure.Core.Foundations.Operation<
+  listDevBoxesByUser is Azure.Core.Foundations.Operation<
     {
       @doc("The DevCenter Project upon which to execute operations.")
       @path
@@ -43,7 +43,7 @@ interface DevBoxesOperations {
   >;
 
   @doc("Gets a Dev Box")
-  getDevBox is StandardResourceOperations.ResourceRead<DevBox>;
+  getDevBoxByUser is StandardResourceOperations.ResourceRead<DevBox>;
 
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Standard operations produce wrong swagger"
   // The standard operation names the body as resource, so the generated swagger has parameter
@@ -57,8 +57,8 @@ interface DevBoxesOperations {
   //     "in": "body",
   //  }
   @doc("Creates or replaces a Dev Box.")
-  @finalOperation(DevBoxesOperations.getDevBox)
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @finalOperation(DevBoxes.getDevBoxByUser)
+  @pollingOperation(OperationStatuses.get)
   @route("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
   @put
   createDevBox is Azure.Core.Foundations.Operation<
@@ -96,7 +96,7 @@ interface DevBoxesOperations {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern"
   //Can not use LongRunningResourceDelete because response is 202 or error, but we also accept 204 response"
   @doc("Deletes a Dev Box.")
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @pollingOperation(OperationStatuses.get)
   @route("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
   @delete
   deleteDevBox is Azure.Core.Foundations.Operation<
@@ -130,7 +130,7 @@ interface DevBoxesOperations {
   >;
 
   @doc("Starts a Dev Box")
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @pollingOperation(OperationStatuses.get)
   @action("start")
   startDevBox is StandardResourceOperations.LongRunningResourceAction<
     DevBox,
@@ -145,7 +145,7 @@ interface DevBoxesOperations {
   >;
 
   @doc("Stops a Dev Box")
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @pollingOperation(OperationStatuses.get)
   @action("stop")
   stopDevBox is StandardResourceOperations.LongRunningResourceAction<
     DevBox,
@@ -164,7 +164,7 @@ interface DevBoxesOperations {
   >;
 
   @doc("Restarts a Dev Box")
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @pollingOperation(OperationStatuses.get)
   @action("restart")
   restartDevBox is StandardResourceOperations.LongRunningResourceAction<
     DevBox,
@@ -201,10 +201,10 @@ interface DevBoxesOperations {
   >;
 
   @doc("Lists actions on a Dev Box.")
-  listDevBoxActions is StandardResourceOperations.ResourceList<DevBoxAction>;
+  listActions is StandardResourceOperations.ResourceList<DevBoxAction>;
 
   @doc("Gets an action.")
-  getDevBoxAction is StandardResourceOperations.ResourceRead<DevBoxAction>;
+  getAction is StandardResourceOperations.ResourceRead<DevBoxAction>;
 
   @doc("Skips an occurrence of an action.")
   @action("skip")
@@ -228,7 +228,7 @@ interface DevBoxesOperations {
 
   @doc("Delays all actions.")
   @action("delay")
-  delayAllActions is StandardResourceOperations.ResourceCollectionAction<
+  delayActions is StandardResourceOperations.ResourceCollectionAction<
     DevBoxAction,
     {
       @doc("The time to delay the Dev Box action or actions until.")
@@ -238,24 +238,3 @@ interface DevBoxesOperations {
     DevBoxActionsDelayMultipleResult
   >;
 }
-
-interface DevBoxesDevCenter {
-  #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern since DevBox has a different path"
-  @doc("Lists Dev Boxes that the caller has access to in the DevCenter.")
-  @route("/devboxes")
-  @get
-  listAllDevBoxes is Azure.Core.Foundations.Operation<{}, DevBoxListResult>;
-
-  #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern since DevBox has a different path"
-  @doc("Lists Dev Boxes in the Dev Center for a particular user.")
-  @route("/users/{userId}/devboxes")
-  @get
-  listAllDevBoxesByUser is Azure.Core.Foundations.Operation<
-    {
-      @doc("The AAD object id of the user. If value is 'me', the identity is taken from the authentication context.")
-      @path
-      userId: string;
-    },
-    DevBoxListResult
-  >;
-}
diff --git a/specification/devcenter/DevCenter/DevCenter/routes.tsp b/specification/devcenter/DevCenter/DevCenter/routes.tsp
index 61be234c1c9a..3b8dec68b01b 100644
--- a/specification/devcenter/DevCenter/DevCenter/routes.tsp
+++ b/specification/devcenter/DevCenter/DevCenter/routes.tsp
@@ -8,10 +8,29 @@ using TypeSpec.Http;
 
 namespace DevCenterService;
 
-interface DevCenterOperations {
+interface DevCenter {
   @doc("Lists all projects.")
   listProjects is StandardResourceOperations.ResourceList<Project>;
 
   @doc("Gets a project.")
   getProject is StandardResourceOperations.ResourceRead<Project>;
+
+  #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern since DevBox has a different path"
+  @doc("Lists Dev Boxes that the caller has access to in the DevCenter.")
+  @route("/devboxes")
+  @get
+  listAllDevBoxes is Azure.Core.Foundations.Operation<{}, DevBoxListResult>;
+
+  #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern since DevBox has a different path"
+  @doc("Lists Dev Boxes in the Dev Center for a particular user.")
+  @route("/users/{userId}/devboxes")
+  @get
+  listAllDevBoxesByUser is Azure.Core.Foundations.Operation<
+    {
+      @doc("The AAD object id of the user. If value is 'me', the identity is taken from the authentication context.")
+      @path
+      userId: string;
+    },
+    DevBoxListResult
+  >;
 }
diff --git a/specification/devcenter/DevCenter/Environments/routes.tsp b/specification/devcenter/DevCenter/Environments/routes.tsp
index f5c6d982b7cf..d894a7044305 100644
--- a/specification/devcenter/DevCenter/Environments/routes.tsp
+++ b/specification/devcenter/DevCenter/Environments/routes.tsp
@@ -10,12 +10,12 @@ using TypeSpec.Http;
 
 namespace DevCenterService;
 
-interface EnvironmentsOperations {
+interface Environments {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern since Environment has a different path"
   @doc("Lists the environments for a project.")
   @route("/projects/{projectName}/environments")
   @get
-  listAllEnvironments is Azure.Core.Foundations.Operation<
+  listEnvironments is Azure.Core.Foundations.Operation<
     {
       @doc("The DevCenter Project upon which to execute operations.")
       @path
@@ -31,7 +31,7 @@ interface EnvironmentsOperations {
   @doc("Lists the environments for a project and user.")
   @route("/projects/{projectName}/users/{userId}/environments")
   @get
-  listEnvironments is Azure.Core.Foundations.Operation<
+  listEnvironmentsByUser is Azure.Core.Foundations.Operation<
     {
       @doc("The DevCenter Project upon which to execute operations.")
       @path
@@ -45,16 +45,16 @@ interface EnvironmentsOperations {
   >;
 
   @doc("Gets an environment")
-  getEnvironment is StandardResourceOperations.ResourceRead<Environment>;
+  getEnvironmentByUser is StandardResourceOperations.ResourceRead<Environment>;
 
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern"
   //Can not use LongRunningCreateOrReplace because response is 200 or 201, but we only respond with 201"
   @doc("Creates or updates an environment.")
-  @finalOperation(EnvironmentsOperations.getEnvironment)
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @finalOperation(Environments.getEnvironmentByUser)
+  @pollingOperation(OperationStatuses.get)
   @route("/projects/{projectName}/users/{userId}/environments/{environmentName}")
   @put
-  createOrUpdateEnvironment is Azure.Core.Foundations.Operation<
+  createOrReplaceEnvironment is Azure.Core.Foundations.Operation<
     {
       @doc("The DevCenter Project upon which to execute operations.")
       @path
@@ -87,7 +87,7 @@ interface EnvironmentsOperations {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern"
   //Can not use LongRunningResourceDelete because response is 202 or error, but we also accept 204 response"
   @doc("Deletes an environment and all its associated resources")
-  @pollingOperation(SharedOperations.getProjectOperationStatus)
+  @pollingOperation(OperationStatuses.get)
   @route("/projects/{projectName}/users/{userId}/environments/{environmentName}")
   @delete
   deleteEnvironment is Azure.Core.Foundations.Operation<
@@ -123,7 +123,7 @@ interface EnvironmentsOperations {
   >;
 
   @doc("Lists all of the catalogs available for a project.")
-  listCatalogs is StandardResourceOperations.ResourceList<Catalog>;
+  listCatalogsByProject is StandardResourceOperations.ResourceList<Catalog>;
 
   @doc("Gets the specified catalog within the project")
   getCatalog is StandardResourceOperations.ResourceRead<Catalog>;
@@ -132,7 +132,7 @@ interface EnvironmentsOperations {
   @doc("Lists all environment definitions available for a project.")
   @route("/projects/{projectName}/environmentDefinitions")
   @get
-  listEnvironmentDefinitions is Azure.Core.Foundations.Operation<
+  listEnvironmentDefinitionsByProject is Azure.Core.Foundations.Operation<
     {
       @doc("The DevCenter Project upon which to execute operations.")
       @path
diff --git a/specification/devcenter/DevCenter/client.tsp b/specification/devcenter/DevCenter/client.tsp
index 541de75b2309..8ed80ce21f9b 100644
--- a/specification/devcenter/DevCenter/client.tsp
+++ b/specification/devcenter/DevCenter/client.tsp
@@ -14,8 +14,8 @@ namespace SdkCustomizations;
   service: DevCenterService,
 })
 interface DevCenterClientOperations {
-  listProjects is DevCenterService.DevCenterOperations.listProjects;
-  getProject is DevCenterService.DevCenterOperations.getProject;
+  listProjects is DevCenterService.DevCenter.listProjects;
+  getProject is DevCenterService.DevCenter.getProject;
 }
 
 #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "detailed suppress description for each operation can be found in routes.tsp"
@@ -24,26 +24,26 @@ interface DevCenterClientOperations {
   service: DevCenterService,
 })
 interface DevBoxesClientOperations {
-  listPools is DevCenterService.DevBoxesOperations.listPools;
-  getPool is DevCenterService.DevBoxesOperations.getPool;
-  listSchedules is DevCenterService.DevBoxesOperations.listSchedules;
-  getSchedule is DevCenterService.DevBoxesOperations.getSchedule;
-  listAllDevBoxes is DevCenterService.DevBoxesDevCenter.listAllDevBoxes;
-  listAllDevBoxesByUser is DevCenterService.DevBoxesDevCenter.listAllDevBoxesByUser;
-  listDevBoxes is DevCenterService.DevBoxesOperations.listDevBoxes;
-  getDevBox is DevCenterService.DevBoxesOperations.getDevBox;
+  listPools is DevCenterService.DevBoxes.listPools;
+  getPool is DevCenterService.DevBoxes.getPool;
+  listSchedules is DevCenterService.DevBoxes.listSchedulesByPool;
+  getSchedule is DevCenterService.DevBoxes.getScheduleByPool;
+  listAllDevBoxes is DevCenterService.DevCenter.listAllDevBoxes;
+  listAllDevBoxesByUser is DevCenterService.DevCenter.listAllDevBoxesByUser;
+  listDevBoxes is DevCenterService.DevBoxes.listDevBoxesByUser;
+  getDevBox is DevCenterService.DevBoxes.getDevBoxByUser;
   @convenientAPI(false, "csharp") // https://github.com/Azure/azure-rest-api-specs/issues/28083
-  createDevBox is DevCenterService.DevBoxesOperations.createDevBox;
-  deleteDevBox is DevCenterService.DevBoxesOperations.deleteDevBox;
-  startDevBox is DevCenterService.DevBoxesOperations.startDevBox;
-  stopDevBox is DevCenterService.DevBoxesOperations.stopDevBox;
-  restartDevBox is DevCenterService.DevBoxesOperations.restartDevBox;
-  getRemoteConnection is DevCenterService.DevBoxesOperations.getRemoteConnection;
-  listDevBoxActions is DevCenterService.DevBoxesOperations.listDevBoxActions;
-  getDevBoxAction is DevCenterService.DevBoxesOperations.getDevBoxAction;
-  skipAction is DevCenterService.DevBoxesOperations.skipAction;
-  delayAction is DevCenterService.DevBoxesOperations.delayAction;
-  delayAllActions is DevCenterService.DevBoxesOperations.delayAllActions;
+  createDevBox is DevCenterService.DevBoxes.createDevBox;
+  deleteDevBox is DevCenterService.DevBoxes.deleteDevBox;
+  startDevBox is DevCenterService.DevBoxes.startDevBox;
+  stopDevBox is DevCenterService.DevBoxes.stopDevBox;
+  restartDevBox is DevCenterService.DevBoxes.restartDevBox;
+  getRemoteConnection is DevCenterService.DevBoxes.getRemoteConnection;
+  listDevBoxActions is DevCenterService.DevBoxes.listActions;
+  getDevBoxAction is DevCenterService.DevBoxes.getAction;
+  skipAction is DevCenterService.DevBoxes.skipAction;
+  delayAction is DevCenterService.DevBoxes.delayAction;
+  delayAllActions is DevCenterService.DevBoxes.delayActions;
 }
 
 #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "detailed suppress description for each operation can be found in routes.tsp"
@@ -52,18 +52,18 @@ interface DevBoxesClientOperations {
   service: DevCenterService,
 })
 interface EnvironmentClientOperations {
-  listAllEnvironments is DevCenterService.EnvironmentsOperations.listAllEnvironments;
-  listEnvironments is DevCenterService.EnvironmentsOperations.listEnvironments;
-  getEnvironment is DevCenterService.EnvironmentsOperations.getEnvironment;
+  listAllEnvironments is DevCenterService.Environments.listEnvironments;
+  listEnvironments is DevCenterService.Environments.listEnvironmentsByUser;
+  getEnvironment is DevCenterService.Environments.getEnvironmentByUser;
   @convenientAPI(false, "csharp") // same issue as described in https://github.com/Azure/azure-rest-api-specs/issues/28083
-  createOrUpdateEnvironment is DevCenterService.EnvironmentsOperations.createOrUpdateEnvironment;
-  deleteEnvironment is DevCenterService.EnvironmentsOperations.deleteEnvironment;
-  listCatalogs is DevCenterService.EnvironmentsOperations.listCatalogs;
-  getCatalog is DevCenterService.EnvironmentsOperations.getCatalog;
-  listEnvironmentDefinitions is DevCenterService.EnvironmentsOperations.listEnvironmentDefinitions;
-  listEnvironmentDefinitionsByCatalog is DevCenterService.EnvironmentsOperations.listEnvironmentDefinitionsByCatalog;
-  getEnvironmentDefinition is DevCenterService.EnvironmentsOperations.getEnvironmentDefinition;
-  listEnvironmentTypes is DevCenterService.EnvironmentsOperations.listEnvironmentTypes;
+  createOrUpdateEnvironment is DevCenterService.Environments.createOrReplaceEnvironment;
+  deleteEnvironment is DevCenterService.Environments.deleteEnvironment;
+  listCatalogs is DevCenterService.Environments.listCatalogsByProject;
+  getCatalog is DevCenterService.Environments.getCatalog;
+  listEnvironmentDefinitions is DevCenterService.Environments.listEnvironmentDefinitionsByProject;
+  listEnvironmentDefinitionsByCatalog is DevCenterService.Environments.listEnvironmentDefinitionsByCatalog;
+  getEnvironmentDefinition is DevCenterService.Environments.getEnvironmentDefinition;
+  listEnvironmentTypes is DevCenterService.Environments.listEnvironmentTypes;
 }
 
 @@usage(DevCenterService.DevBox, Usage.input | Usage.output);
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_CreateDevBox.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_CreateDevBox.json
similarity index 97%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_CreateDevBox.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_CreateDevBox.json
index f51bad1c0086..c7e4037d4b1d 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_CreateDevBox.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_CreateDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Creates or replaces a Dev Box.",
-  "operationId": "DevBoxesOperations_CreateDevBox",
+  "operationId": "DevBoxes_CreateDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DelayAction.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DelayAction.json
similarity index 93%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DelayAction.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DelayAction.json
index db7107cfc6bc..6a5868c5ec6f 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DelayAction.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DelayAction.json
@@ -1,6 +1,6 @@
 {
   "title": "Delays the occurrence of an action.",
-  "operationId": "DevBoxesOperations_DelayAction",
+  "operationId": "DevBoxes_DelayAction",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DelayAllActions.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DelayActions.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DelayAllActions.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DelayActions.json
index 6a7ade1eef30..4a262b90f9a4 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DelayAllActions.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DelayActions.json
@@ -1,6 +1,6 @@
 {
   "title": "Delays all actions.",
-  "operationId": "DevBoxesOperations_DelayAllActions",
+  "operationId": "DevBoxes_DelayActions",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DeleteDevBox.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DeleteDevBox.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DeleteDevBox.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DeleteDevBox.json
index 4843a80ed6c9..bf47f4e2ece2 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DeleteDevBox.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_DeleteDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Deletes a Dev Box.",
-  "operationId": "DevBoxesOperations_DeleteDevBox",
+  "operationId": "DevBoxes_DeleteDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetDevBoxAction.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetAction.json
similarity index 91%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetDevBoxAction.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetAction.json
index 0d94918c712d..b876055179ad 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetDevBoxAction.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetAction.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets an action.",
-  "operationId": "DevBoxesOperations_GetDevBoxAction",
+  "operationId": "DevBoxes_GetAction",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetDevBox.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetDevBoxByUser.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetDevBox.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetDevBoxByUser.json
index f29193eb0b35..d4c50766da3f 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetDevBox.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetDevBoxByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a Dev Box",
-  "operationId": "DevBoxesOperations_GetDevBox",
+  "operationId": "DevBoxes_GetDevBoxByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetPool.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetPool.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetPool.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetPool.json
index 7b53a6ac96b4..3bd532947546 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetPool.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetPool.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a pool",
-  "operationId": "DevBoxesOperations_GetPool",
+  "operationId": "DevBoxes_GetPool",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetRemoteConnection.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetRemoteConnection.json
similarity index 87%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetRemoteConnection.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetRemoteConnection.json
index a01b7df571fd..3ff9f5a30770 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetRemoteConnection.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetRemoteConnection.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets RDP Connection info",
-  "operationId": "DevBoxesOperations_GetRemoteConnection",
+  "operationId": "DevBoxes_GetRemoteConnection",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetSchedule.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetScheduleByPool.json
similarity index 90%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetSchedule.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetScheduleByPool.json
index 8ba5489b95c6..24b194ccf289 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetSchedule.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_GetScheduleByPool.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a schedule.",
-  "operationId": "DevBoxesOperations_GetSchedule",
+  "operationId": "DevBoxes_GetScheduleByPool",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListDevBoxActions.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListActions.json
similarity index 94%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListDevBoxActions.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListActions.json
index db1ae0af7c62..cb83e457ecd9 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListDevBoxActions.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListActions.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists actions on a Dev Box.",
-  "operationId": "DevBoxesOperations_ListDevBoxActions",
+  "operationId": "DevBoxes_ListActions",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListDevBoxes.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListDevBoxesByUser.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListDevBoxes.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListDevBoxesByUser.json
index 2140a65cb857..7d0056e0593e 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListDevBoxes.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListDevBoxesByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists Dev Boxes in the project for a particular user.",
-  "operationId": "DevBoxesOperations_ListDevBoxes",
+  "operationId": "DevBoxes_ListDevBoxesByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListPools.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListPools.json
similarity index 97%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListPools.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListPools.json
index 42c39b484d20..f31808873991 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListPools.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListPools.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists available pools",
-  "operationId": "DevBoxesOperations_ListPools",
+  "operationId": "DevBoxes_ListPools",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListSchedules.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListSchedulesByPool.json
similarity index 91%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListSchedules.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListSchedulesByPool.json
index 0a5afd4f207a..1f97f0f41fe7 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListSchedules.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_ListSchedulesByPool.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists available schedules for a pool.",
-  "operationId": "DevBoxesOperations_ListSchedules",
+  "operationId": "DevBoxes_ListSchedulesByPool",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_RestartDevBox.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_RestartDevBox.json
similarity index 94%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_RestartDevBox.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_RestartDevBox.json
index 3c0e55515dd6..f9abacb1d881 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_RestartDevBox.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_RestartDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Restarts a Dev Box",
-  "operationId": "DevBoxesOperations_RestartDevBox",
+  "operationId": "DevBoxes_RestartDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_SkipAction.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_SkipAction.json
similarity index 88%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_SkipAction.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_SkipAction.json
index 1e8552d6bd35..b44cbd7dc65a 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_SkipAction.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_SkipAction.json
@@ -1,6 +1,6 @@
 {
   "title": "Skips an occurrence of an action.",
-  "operationId": "DevBoxesOperations_SkipAction",
+  "operationId": "DevBoxes_SkipAction",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_StartDevBox.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_StartDevBox.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_StartDevBox.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_StartDevBox.json
index 292e5e1c947a..462358dc151e 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_StartDevBox.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_StartDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Starts a Dev Box",
-  "operationId": "DevBoxesOperations_StartDevBox",
+  "operationId": "DevBoxes_StartDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_StopDevBox.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_StopDevBox.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_StopDevBox.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_StopDevBox.json
index b92d1089e864..eb10c60cf0c8 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_StopDevBox.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxes_StopDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Stops a Dev Box",
-  "operationId": "DevBoxesOperations_StopDevBox",
+  "operationId": "DevBoxes_StopDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevCenterOperations_GetProject.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_GetProject.json
similarity index 87%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevCenterOperations_GetProject.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_GetProject.json
index fe1a721864bc..cc1f988275f0 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevCenterOperations_GetProject.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_GetProject.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a project.",
-  "operationId": "DevCenterOperations_GetProject",
+  "operationId": "DevCenter_GetProject",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesDevCenterOperations_ListAllDevBoxes.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListAllDevBoxes.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesDevCenterOperations_ListAllDevBoxes.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListAllDevBoxes.json
index 33e7210819fb..490fdc30c11a 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesDevCenterOperations_ListAllDevBoxes.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListAllDevBoxes.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists Dev Boxes that the caller has access to in the DevCenter.",
-  "operationId": "DevBoxesDevCenter_ListAllDevBoxes",
+  "operationId": "DevCenter_ListAllDevBoxes",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/"
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListAllDevBoxesByUser.json
similarity index 94%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListAllDevBoxesByUser.json
index 1fde15c1bbb5..84afde2e5cae 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListAllDevBoxesByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists Dev Boxes in the Dev Center for a particular user.",
-  "operationId": "DevBoxesDevCenter_ListAllDevBoxesByUser",
+  "operationId": "DevCenter_ListAllDevBoxesByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenterOperations_ListProjects.json b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListProjects.json
similarity index 88%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenterOperations_ListProjects.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListProjects.json
index 1e7bdde95309..08b5c7d28016 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenterOperations_ListProjects.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/DevCenter_ListProjects.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all projects.",
-  "operationId": "DevCenterOperations_ListProjects",
+  "operationId": "DevCenter_ListProjects",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com"
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_CreateOrUpdateEnvironment.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_CreateOrReplaceEnvironment.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_CreateOrUpdateEnvironment.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_CreateOrReplaceEnvironment.json
index 40bd8016a490..4fe037bc3d8a 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_CreateOrUpdateEnvironment.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_CreateOrReplaceEnvironment.json
@@ -1,6 +1,6 @@
 {
   "title": "Creates or updates an environment.",
-  "operationId": "EnvironmentsOperations_CreateOrUpdateEnvironment",
+  "operationId": "Environments_CreateOrReplaceEnvironment",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_DeleteEnvironment.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_DeleteEnvironment.json
similarity index 94%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_DeleteEnvironment.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_DeleteEnvironment.json
index db378d427835..2c6dec31e1f3 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_DeleteEnvironment.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_DeleteEnvironment.json
@@ -1,6 +1,6 @@
 {
   "title": "Deletes an environment and all its associated resources",
-  "operationId": "EnvironmentsOperations_DeleteEnvironment",
+  "operationId": "Environments_DeleteEnvironment",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetCatalog.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetCatalog.json
similarity index 87%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetCatalog.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetCatalog.json
index 7d9de8e13786..7a6ccf37974b 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetCatalog.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetCatalog.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets the specified catalog within the project",
-  "operationId": "EnvironmentsOperations_GetCatalog",
+  "operationId": "Environments_GetCatalog",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetEnvironment.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetEnvironmentByUser.json
similarity index 93%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetEnvironment.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetEnvironmentByUser.json
index eb89813acaf7..2268bb527cb7 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetEnvironment.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetEnvironmentByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets an environment",
-  "operationId": "EnvironmentsOperations_GetEnvironment",
+  "operationId": "Environments_GetEnvironmentByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetEnvironmentDefinition.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetEnvironmentDefinition.json
similarity index 96%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetEnvironmentDefinition.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetEnvironmentDefinition.json
index e4efa7edea54..e08ddd9df7f6 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetEnvironmentDefinition.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_GetEnvironmentDefinition.json
@@ -1,6 +1,6 @@
 {
   "title": "Get an environment definition from a catalog.",
-  "operationId": "EnvironmentsOperations_GetEnvironmentDefinition",
+  "operationId": "Environments_GetEnvironmentDefinition",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListCatalogs.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListCatalogsByProject.json
similarity index 88%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListCatalogs.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListCatalogsByProject.json
index 17c683e6c9b3..d4c4efe8440a 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListCatalogs.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListCatalogsByProject.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all of the catalogs available for a project.",
-  "operationId": "EnvironmentsOperations_ListCatalogs",
+  "operationId": "Environments_ListCatalogsByProject",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentDefinitionsByCatalog.json
similarity index 97%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentDefinitionsByCatalog.json
index d9c411224b8e..4c021662bf33 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentDefinitionsByCatalog.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all environment definitions available within a catalog.",
-  "operationId": "EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog",
+  "operationId": "Environments_ListEnvironmentDefinitionsByCatalog",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentDefinitions.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentDefinitionsByProject.json
similarity index 97%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentDefinitions.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentDefinitionsByProject.json
index aabe3738602c..ad3f1b05bbe7 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentDefinitions.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentDefinitionsByProject.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all environment definitions available for a project.",
-  "operationId": "EnvironmentsOperations_ListEnvironmentDefinitions",
+  "operationId": "Environments_ListEnvironmentDefinitionsByProject",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentTypes.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentTypes.json
similarity index 89%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentTypes.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentTypes.json
index 83e22df09846..364712b931e0 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentTypes.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentTypes.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all environment types configured for a project.",
-  "operationId": "EnvironmentsOperations_ListEnvironmentTypes",
+  "operationId": "Environments_ListEnvironmentTypes",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListAllEnvironments.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironments.json
similarity index 93%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListAllEnvironments.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironments.json
index ab203c460a33..dbee94d1a1ea 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListAllEnvironments.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironments.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists the environments for a project.",
-  "operationId": "EnvironmentsOperations_ListAllEnvironments",
+  "operationId": "Environments_ListEnvironments",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironments.json b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentsByUser.json
similarity index 93%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironments.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentsByUser.json
index 51f0384a6ffb..6d34c99ca04a 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironments.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/Environments_ListEnvironmentsByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists the environments for a project and user.",
-  "operationId": "EnvironmentsOperations_ListEnvironments",
+  "operationId": "Environments_ListEnvironmentsByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/SharedOperations_GetProjectOperationStatus.json b/specification/devcenter/DevCenter/examples/2023-04-01/OperationStatuses_Get.json
similarity index 88%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/SharedOperations_GetProjectOperationStatus.json
rename to specification/devcenter/DevCenter/examples/2023-04-01/OperationStatuses_Get.json
index d6c4b10ab2f4..5eb732d0c312 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/SharedOperations_GetProjectOperationStatus.json
+++ b/specification/devcenter/DevCenter/examples/2023-04-01/OperationStatuses_Get.json
@@ -1,6 +1,6 @@
 {
   "title": "Get the status of an operation.",
-  "operationId": "SharedOperations_GetProjectOperationStatus",
+  "operationId": "OperationStatuses_Get",
   "parameters": {
     "api-version": "2023-04-01",
     "projectName": "myProject",
diff --git a/specification/devcenter/DevCenter/python-client.tsp b/specification/devcenter/DevCenter/python-client.tsp
index a921be43f1a3..ed215fe424bb 100644
--- a/specification/devcenter/DevCenter/python-client.tsp
+++ b/specification/devcenter/DevCenter/python-client.tsp
@@ -16,42 +16,42 @@ namespace PythonSdkCustomizations;
 })
 interface DevCenterClientOperations {
   //DevCenters
-  listProjects is DevCenterService.DevCenterOperations.listProjects;
-  getProject is DevCenterService.DevCenterOperations.getProject;
+  listProjects is DevCenterService.DevCenter.listProjects;
+  getProject is DevCenterService.DevCenter.getProject;
 
   //DevBoxes
-  listPools is DevCenterService.DevBoxesOperations.listPools;
-  getPool is DevCenterService.DevBoxesOperations.getPool;
-  listSchedules is DevCenterService.DevBoxesOperations.listSchedules;
-  getSchedule is DevCenterService.DevBoxesOperations.getSchedule;
-  listAllDevBoxes is DevCenterService.DevBoxesDevCenter.listAllDevBoxes;
-  listAllDevBoxesByUser is DevCenterService.DevBoxesDevCenter.listAllDevBoxesByUser;
-  listDevBoxes is DevCenterService.DevBoxesOperations.listDevBoxes;
-  getDevBox is DevCenterService.DevBoxesOperations.getDevBox;
-  createDevBox is DevCenterService.DevBoxesOperations.createDevBox;
-  deleteDevBox is DevCenterService.DevBoxesOperations.deleteDevBox;
-  startDevBox is DevCenterService.DevBoxesOperations.startDevBox;
-  stopDevBox is DevCenterService.DevBoxesOperations.stopDevBox;
-  restartDevBox is DevCenterService.DevBoxesOperations.restartDevBox;
-  getRemoteConnection is DevCenterService.DevBoxesOperations.getRemoteConnection;
-  listDevBoxActions is DevCenterService.DevBoxesOperations.listDevBoxActions;
-  getDevBoxAction is DevCenterService.DevBoxesOperations.getDevBoxAction;
-  skipDevBoxAction is DevCenterService.DevBoxesOperations.skipAction;
-  delayDevBoxAction is DevCenterService.DevBoxesOperations.delayAction;
-  delayAllDevBoxActions is DevCenterService.DevBoxesOperations.delayAllActions;
+  listPools is DevCenterService.DevBoxes.listPools;
+  getPool is DevCenterService.DevBoxes.getPool;
+  listSchedules is DevCenterService.DevBoxes.listSchedulesByPool;
+  getSchedule is DevCenterService.DevBoxes.getScheduleByPool;
+  listAllDevBoxes is DevCenterService.DevCenter.listAllDevBoxes;
+  listAllDevBoxesByUser is DevCenterService.DevCenter.listAllDevBoxesByUser;
+  listDevBoxes is DevCenterService.DevBoxes.listDevBoxesByUser;
+  getDevBox is DevCenterService.DevBoxes.getDevBoxByUser;
+  createDevBox is DevCenterService.DevBoxes.createDevBox;
+  deleteDevBox is DevCenterService.DevBoxes.deleteDevBox;
+  startDevBox is DevCenterService.DevBoxes.startDevBox;
+  stopDevBox is DevCenterService.DevBoxes.stopDevBox;
+  restartDevBox is DevCenterService.DevBoxes.restartDevBox;
+  getRemoteConnection is DevCenterService.DevBoxes.getRemoteConnection;
+  listDevBoxActions is DevCenterService.DevBoxes.listActions;
+  getDevBoxAction is DevCenterService.DevBoxes.getAction;
+  skipDevBoxAction is DevCenterService.DevBoxes.skipAction;
+  delayDevBoxAction is DevCenterService.DevBoxes.delayAction;
+  delayAllDevBoxActions is DevCenterService.DevBoxes.delayActions;
 
   //Environments
-  listAllEnvironments is DevCenterService.EnvironmentsOperations.listAllEnvironments;
-  listEnvironments is DevCenterService.EnvironmentsOperations.listEnvironments;
-  getEnvironment is DevCenterService.EnvironmentsOperations.getEnvironment;
-  createOrUpdateEnvironment is DevCenterService.EnvironmentsOperations.createOrUpdateEnvironment;
-  deleteEnvironment is DevCenterService.EnvironmentsOperations.deleteEnvironment;
-  listCatalogs is DevCenterService.EnvironmentsOperations.listCatalogs;
-  getCatalog is DevCenterService.EnvironmentsOperations.getCatalog;
-  listEnvironmentDefinitions is DevCenterService.EnvironmentsOperations.listEnvironmentDefinitions;
-  listEnvironmentDefinitionsByCatalog is DevCenterService.EnvironmentsOperations.listEnvironmentDefinitionsByCatalog;
-  getEnvironmentDefinition is DevCenterService.EnvironmentsOperations.getEnvironmentDefinition;
-  listEnvironmentTypes is DevCenterService.EnvironmentsOperations.listEnvironmentTypes;
+  listAllEnvironments is DevCenterService.Environments.listEnvironments;
+  listEnvironments is DevCenterService.Environments.listEnvironmentsByUser;
+  getEnvironment is DevCenterService.Environments.getEnvironmentByUser;
+  createOrUpdateEnvironment is DevCenterService.Environments.createOrReplaceEnvironment;
+  deleteEnvironment is DevCenterService.Environments.deleteEnvironment;
+  listCatalogs is DevCenterService.Environments.listCatalogsByProject;
+  getCatalog is DevCenterService.Environments.getCatalog;
+  listEnvironmentDefinitions is DevCenterService.Environments.listEnvironmentDefinitionsByProject;
+  listEnvironmentDefinitionsByCatalog is DevCenterService.Environments.listEnvironmentDefinitionsByCatalog;
+  getEnvironmentDefinition is DevCenterService.Environments.getEnvironmentDefinition;
+  listEnvironmentTypes is DevCenterService.Environments.listEnvironmentTypes;
 }
 
 @@clientName(DevCenterService.LocalAdminStatus, "LocalAdministratorStatus");
diff --git a/specification/devcenter/DevCenter/shared/routes.tsp b/specification/devcenter/DevCenter/shared/routes.tsp
index a477894e502b..2a88ef3ede80 100644
--- a/specification/devcenter/DevCenter/shared/routes.tsp
+++ b/specification/devcenter/DevCenter/shared/routes.tsp
@@ -8,7 +8,7 @@ using TypeSpec.Http;
 
 namespace DevCenterService;
 
-interface SharedOperations {
+interface OperationStatuses {
   @doc("Get the status of an operation.")
-  getProjectOperationStatus is StandardResourceOperations.ResourceRead<OperationStatus>;
+  get is StandardResourceOperations.ResourceRead<OperationStatus>;
 }
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/devcenter.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/devcenter.json
index acc05839e320..9a5b1b2b71b5 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/devcenter.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/devcenter.json
@@ -53,7 +53,7 @@
   "paths": {
     "/devboxes": {
       "get": {
-        "operationId": "DevBoxesDevCenter_ListAllDevBoxes",
+        "operationId": "DevCenter_ListAllDevBoxes",
         "description": "Lists Dev Boxes that the caller has access to in the DevCenter.",
         "parameters": [
           {
@@ -82,7 +82,7 @@
         },
         "x-ms-examples": {
           "Lists Dev Boxes that the caller has access to in the DevCenter.": {
-            "$ref": "./examples/DevBoxesDevCenterOperations_ListAllDevBoxes.json"
+            "$ref": "./examples/DevCenter_ListAllDevBoxes.json"
           }
         },
         "x-ms-pageable": {
@@ -92,7 +92,7 @@
     },
     "/projects": {
       "get": {
-        "operationId": "DevCenterOperations_ListProjects",
+        "operationId": "DevCenter_ListProjects",
         "description": "Lists all projects.",
         "parameters": [
           {
@@ -121,7 +121,7 @@
         },
         "x-ms-examples": {
           "Lists all projects.": {
-            "$ref": "./examples/DevCenterOperations_ListProjects.json"
+            "$ref": "./examples/DevCenter_ListProjects.json"
           }
         },
         "x-ms-pageable": {
@@ -131,7 +131,7 @@
     },
     "/projects/{projectName}": {
       "get": {
-        "operationId": "DevCenterOperations_GetProject",
+        "operationId": "DevCenter_GetProject",
         "description": "Gets a project.",
         "parameters": [
           {
@@ -170,14 +170,14 @@
         },
         "x-ms-examples": {
           "Gets a project.": {
-            "$ref": "./examples/DevCenterOperations_GetProject.json"
+            "$ref": "./examples/DevCenter_GetProject.json"
           }
         }
       }
     },
     "/projects/{projectName}/catalogs": {
       "get": {
-        "operationId": "EnvironmentsOperations_ListCatalogs",
+        "operationId": "Environments_ListCatalogsByProject",
         "description": "Lists all of the catalogs available for a project.",
         "parameters": [
           {
@@ -216,7 +216,7 @@
         },
         "x-ms-examples": {
           "Lists all of the catalogs available for a project.": {
-            "$ref": "./examples/EnvironmentsOperations_ListCatalogs.json"
+            "$ref": "./examples/Environments_ListCatalogsByProject.json"
           }
         },
         "x-ms-pageable": {
@@ -226,7 +226,7 @@
     },
     "/projects/{projectName}/catalogs/{catalogName}": {
       "get": {
-        "operationId": "EnvironmentsOperations_GetCatalog",
+        "operationId": "Environments_GetCatalog",
         "description": "Gets the specified catalog within the project",
         "parameters": [
           {
@@ -275,14 +275,14 @@
         },
         "x-ms-examples": {
           "Gets the specified catalog within the project": {
-            "$ref": "./examples/EnvironmentsOperations_GetCatalog.json"
+            "$ref": "./examples/Environments_GetCatalog.json"
           }
         }
       }
     },
     "/projects/{projectName}/catalogs/{catalogName}/environmentDefinitions": {
       "get": {
-        "operationId": "EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog",
+        "operationId": "Environments_ListEnvironmentDefinitionsByCatalog",
         "description": "Lists all environment definitions available within a catalog.",
         "parameters": [
           {
@@ -325,7 +325,7 @@
         },
         "x-ms-examples": {
           "Lists all environment definitions available within a catalog.": {
-            "$ref": "./examples/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json"
+            "$ref": "./examples/Environments_ListEnvironmentDefinitionsByCatalog.json"
           }
         },
         "x-ms-pageable": {
@@ -335,7 +335,7 @@
     },
     "/projects/{projectName}/catalogs/{catalogName}/environmentDefinitions/{definitionName}": {
       "get": {
-        "operationId": "EnvironmentsOperations_GetEnvironmentDefinition",
+        "operationId": "Environments_GetEnvironmentDefinition",
         "description": "Get an environment definition from a catalog.",
         "parameters": [
           {
@@ -394,14 +394,14 @@
         },
         "x-ms-examples": {
           "Get an environment definition from a catalog.": {
-            "$ref": "./examples/EnvironmentsOperations_GetEnvironmentDefinition.json"
+            "$ref": "./examples/Environments_GetEnvironmentDefinition.json"
           }
         }
       }
     },
     "/projects/{projectName}/environmentDefinitions": {
       "get": {
-        "operationId": "EnvironmentsOperations_ListEnvironmentDefinitions",
+        "operationId": "Environments_ListEnvironmentDefinitionsByProject",
         "description": "Lists all environment definitions available for a project.",
         "parameters": [
           {
@@ -437,7 +437,7 @@
         },
         "x-ms-examples": {
           "Lists all environment definitions available for a project.": {
-            "$ref": "./examples/EnvironmentsOperations_ListEnvironmentDefinitions.json"
+            "$ref": "./examples/Environments_ListEnvironmentDefinitionsByProject.json"
           }
         },
         "x-ms-pageable": {
@@ -447,7 +447,7 @@
     },
     "/projects/{projectName}/environmentTypes": {
       "get": {
-        "operationId": "EnvironmentsOperations_ListEnvironmentTypes",
+        "operationId": "Environments_ListEnvironmentTypes",
         "description": "Lists all environment types configured for a project.",
         "parameters": [
           {
@@ -483,7 +483,7 @@
         },
         "x-ms-examples": {
           "Lists all environment types configured for a project.": {
-            "$ref": "./examples/EnvironmentsOperations_ListEnvironmentTypes.json"
+            "$ref": "./examples/Environments_ListEnvironmentTypes.json"
           }
         },
         "x-ms-pageable": {
@@ -493,7 +493,7 @@
     },
     "/projects/{projectName}/environments": {
       "get": {
-        "operationId": "EnvironmentsOperations_ListAllEnvironments",
+        "operationId": "Environments_ListEnvironments",
         "description": "Lists the environments for a project.",
         "parameters": [
           {
@@ -529,7 +529,7 @@
         },
         "x-ms-examples": {
           "Lists the environments for a project.": {
-            "$ref": "./examples/EnvironmentsOperations_ListAllEnvironments.json"
+            "$ref": "./examples/Environments_ListEnvironments.json"
           }
         },
         "x-ms-pageable": {
@@ -539,7 +539,7 @@
     },
     "/projects/{projectName}/operationstatuses/{operationId}": {
       "get": {
-        "operationId": "SharedOperations_GetProjectOperationStatus",
+        "operationId": "OperationStatuses_Get",
         "description": "Get the status of an operation.",
         "parameters": [
           {
@@ -585,14 +585,14 @@
         },
         "x-ms-examples": {
           "Get the status of an operation.": {
-            "$ref": "./examples/SharedOperations_GetProjectOperationStatus.json"
+            "$ref": "./examples/OperationStatuses_Get.json"
           }
         }
       }
     },
     "/projects/{projectName}/pools": {
       "get": {
-        "operationId": "DevBoxesOperations_ListPools",
+        "operationId": "DevBoxes_ListPools",
         "description": "Lists available pools",
         "parameters": [
           {
@@ -631,7 +631,7 @@
         },
         "x-ms-examples": {
           "Lists available pools": {
-            "$ref": "./examples/DevBoxesOperations_ListPools.json"
+            "$ref": "./examples/DevBoxes_ListPools.json"
           }
         },
         "x-ms-pageable": {
@@ -641,7 +641,7 @@
     },
     "/projects/{projectName}/pools/{poolName}": {
       "get": {
-        "operationId": "DevBoxesOperations_GetPool",
+        "operationId": "DevBoxes_GetPool",
         "description": "Gets a pool",
         "parameters": [
           {
@@ -687,14 +687,14 @@
         },
         "x-ms-examples": {
           "Gets a pool": {
-            "$ref": "./examples/DevBoxesOperations_GetPool.json"
+            "$ref": "./examples/DevBoxes_GetPool.json"
           }
         }
       }
     },
     "/projects/{projectName}/pools/{poolName}/schedules": {
       "get": {
-        "operationId": "DevBoxesOperations_ListSchedules",
+        "operationId": "DevBoxes_ListSchedulesByPool",
         "description": "Lists available schedules for a pool.",
         "parameters": [
           {
@@ -740,7 +740,7 @@
         },
         "x-ms-examples": {
           "Lists available schedules for a pool.": {
-            "$ref": "./examples/DevBoxesOperations_ListSchedules.json"
+            "$ref": "./examples/DevBoxes_ListSchedulesByPool.json"
           }
         },
         "x-ms-pageable": {
@@ -750,7 +750,7 @@
     },
     "/projects/{projectName}/pools/{poolName}/schedules/{scheduleName}": {
       "get": {
-        "operationId": "DevBoxesOperations_GetSchedule",
+        "operationId": "DevBoxes_GetScheduleByPool",
         "description": "Gets a schedule.",
         "parameters": [
           {
@@ -803,14 +803,14 @@
         },
         "x-ms-examples": {
           "Gets a schedule.": {
-            "$ref": "./examples/DevBoxesOperations_GetSchedule.json"
+            "$ref": "./examples/DevBoxes_GetScheduleByPool.json"
           }
         }
       }
     },
     "/projects/{projectName}/users/{userId}/devboxes": {
       "get": {
-        "operationId": "DevBoxesOperations_ListDevBoxes",
+        "operationId": "DevBoxes_ListDevBoxesByUser",
         "description": "Lists Dev Boxes in the project for a particular user.",
         "parameters": [
           {
@@ -853,7 +853,7 @@
         },
         "x-ms-examples": {
           "Lists Dev Boxes in the project for a particular user.": {
-            "$ref": "./examples/DevBoxesOperations_ListDevBoxes.json"
+            "$ref": "./examples/DevBoxes_ListDevBoxesByUser.json"
           }
         },
         "x-ms-pageable": {
@@ -863,7 +863,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}": {
       "get": {
-        "operationId": "DevBoxesOperations_GetDevBox",
+        "operationId": "DevBoxes_GetDevBoxByUser",
         "description": "Gets a Dev Box",
         "parameters": [
           {
@@ -922,12 +922,12 @@
         },
         "x-ms-examples": {
           "Gets a Dev Box": {
-            "$ref": "./examples/DevBoxesOperations_GetDevBox.json"
+            "$ref": "./examples/DevBoxes_GetDevBoxByUser.json"
           }
         }
       },
       "put": {
-        "operationId": "DevBoxesOperations_CreateDevBox",
+        "operationId": "DevBoxes_CreateDevBox",
         "description": "Creates or replaces a Dev Box.",
         "parameters": [
           {
@@ -1002,13 +1002,13 @@
         },
         "x-ms-examples": {
           "Creates or replaces a Dev Box.": {
-            "$ref": "./examples/DevBoxesOperations_CreateDevBox.json"
+            "$ref": "./examples/DevBoxes_CreateDevBox.json"
           }
         },
         "x-ms-long-running-operation": true
       },
       "delete": {
-        "operationId": "DevBoxesOperations_DeleteDevBox",
+        "operationId": "DevBoxes_DeleteDevBox",
         "description": "Deletes a Dev Box.",
         "parameters": [
           {
@@ -1069,7 +1069,7 @@
         },
         "x-ms-examples": {
           "Deletes a Dev Box.": {
-            "$ref": "./examples/DevBoxesOperations_DeleteDevBox.json"
+            "$ref": "./examples/DevBoxes_DeleteDevBox.json"
           }
         },
         "x-ms-long-running-operation": true
@@ -1077,7 +1077,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:start": {
       "post": {
-        "operationId": "DevBoxesOperations_StartDevBox",
+        "operationId": "DevBoxes_StartDevBox",
         "description": "Starts a Dev Box",
         "parameters": [
           {
@@ -1143,7 +1143,7 @@
         },
         "x-ms-examples": {
           "Starts a Dev Box": {
-            "$ref": "./examples/DevBoxesOperations_StartDevBox.json"
+            "$ref": "./examples/DevBoxes_StartDevBox.json"
           }
         },
         "x-ms-long-running-operation": true
@@ -1151,7 +1151,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:stop": {
       "post": {
-        "operationId": "DevBoxesOperations_StopDevBox",
+        "operationId": "DevBoxes_StopDevBox",
         "description": "Stops a Dev Box",
         "parameters": [
           {
@@ -1224,7 +1224,7 @@
         },
         "x-ms-examples": {
           "Stops a Dev Box": {
-            "$ref": "./examples/DevBoxesOperations_StopDevBox.json"
+            "$ref": "./examples/DevBoxes_StopDevBox.json"
           }
         },
         "x-ms-long-running-operation": true
@@ -1232,7 +1232,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:restart": {
       "post": {
-        "operationId": "DevBoxesOperations_RestartDevBox",
+        "operationId": "DevBoxes_RestartDevBox",
         "description": "Restarts a Dev Box",
         "parameters": [
           {
@@ -1298,7 +1298,7 @@
         },
         "x-ms-examples": {
           "Restarts a Dev Box": {
-            "$ref": "./examples/DevBoxesOperations_RestartDevBox.json"
+            "$ref": "./examples/DevBoxes_RestartDevBox.json"
           }
         },
         "x-ms-long-running-operation": true
@@ -1306,7 +1306,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions": {
       "get": {
-        "operationId": "DevBoxesOperations_ListDevBoxActions",
+        "operationId": "DevBoxes_ListActions",
         "description": "Lists actions on a Dev Box.",
         "parameters": [
           {
@@ -1365,7 +1365,7 @@
         },
         "x-ms-examples": {
           "Lists actions on a Dev Box.": {
-            "$ref": "./examples/DevBoxesOperations_ListDevBoxActions.json"
+            "$ref": "./examples/DevBoxes_ListActions.json"
           }
         },
         "x-ms-pageable": {
@@ -1375,7 +1375,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}": {
       "get": {
-        "operationId": "DevBoxesOperations_GetDevBoxAction",
+        "operationId": "DevBoxes_GetAction",
         "description": "Gets an action.",
         "parameters": [
           {
@@ -1444,14 +1444,14 @@
         },
         "x-ms-examples": {
           "Gets an action.": {
-            "$ref": "./examples/DevBoxesOperations_GetDevBoxAction.json"
+            "$ref": "./examples/DevBoxes_GetAction.json"
           }
         }
       }
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}:skip": {
       "post": {
-        "operationId": "DevBoxesOperations_SkipAction",
+        "operationId": "DevBoxes_SkipAction",
         "description": "Skips an occurrence of an action.",
         "parameters": [
           {
@@ -1517,14 +1517,14 @@
         },
         "x-ms-examples": {
           "Skips an occurrence of an action.": {
-            "$ref": "./examples/DevBoxesOperations_SkipAction.json"
+            "$ref": "./examples/DevBoxes_SkipAction.json"
           }
         }
       }
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}:delay": {
       "post": {
-        "operationId": "DevBoxesOperations_DelayAction",
+        "operationId": "DevBoxes_DelayAction",
         "description": "Delays the occurrence of an action.",
         "parameters": [
           {
@@ -1602,14 +1602,14 @@
         },
         "x-ms-examples": {
           "Delays the occurrence of an action.": {
-            "$ref": "./examples/DevBoxesOperations_DelayAction.json"
+            "$ref": "./examples/DevBoxes_DelayAction.json"
           }
         }
       }
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions:delay": {
       "post": {
-        "operationId": "DevBoxesOperations_DelayAllActions",
+        "operationId": "DevBoxes_DelayActions",
         "description": "Delays all actions.",
         "parameters": [
           {
@@ -1677,7 +1677,7 @@
         },
         "x-ms-examples": {
           "Delays all actions.": {
-            "$ref": "./examples/DevBoxesOperations_DelayAllActions.json"
+            "$ref": "./examples/DevBoxes_DelayActions.json"
           }
         },
         "x-ms-pageable": {
@@ -1687,7 +1687,7 @@
     },
     "/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/remoteConnection": {
       "get": {
-        "operationId": "DevBoxesOperations_GetRemoteConnection",
+        "operationId": "DevBoxes_GetRemoteConnection",
         "description": "Gets RDP Connection info",
         "parameters": [
           {
@@ -1737,14 +1737,14 @@
         },
         "x-ms-examples": {
           "Gets RDP Connection info": {
-            "$ref": "./examples/DevBoxesOperations_GetRemoteConnection.json"
+            "$ref": "./examples/DevBoxes_GetRemoteConnection.json"
           }
         }
       }
     },
     "/projects/{projectName}/users/{userId}/environments": {
       "get": {
-        "operationId": "EnvironmentsOperations_ListEnvironments",
+        "operationId": "Environments_ListEnvironmentsByUser",
         "description": "Lists the environments for a project and user.",
         "parameters": [
           {
@@ -1787,7 +1787,7 @@
         },
         "x-ms-examples": {
           "Lists the environments for a project and user.": {
-            "$ref": "./examples/EnvironmentsOperations_ListEnvironments.json"
+            "$ref": "./examples/Environments_ListEnvironmentsByUser.json"
           }
         },
         "x-ms-pageable": {
@@ -1797,7 +1797,7 @@
     },
     "/projects/{projectName}/users/{userId}/environments/{environmentName}": {
       "get": {
-        "operationId": "EnvironmentsOperations_GetEnvironment",
+        "operationId": "Environments_GetEnvironmentByUser",
         "description": "Gets an environment",
         "parameters": [
           {
@@ -1856,12 +1856,12 @@
         },
         "x-ms-examples": {
           "Gets an environment": {
-            "$ref": "./examples/EnvironmentsOperations_GetEnvironment.json"
+            "$ref": "./examples/Environments_GetEnvironmentByUser.json"
           }
         }
       },
       "put": {
-        "operationId": "EnvironmentsOperations_CreateOrUpdateEnvironment",
+        "operationId": "Environments_CreateOrReplaceEnvironment",
         "description": "Creates or updates an environment.",
         "parameters": [
           {
@@ -1925,13 +1925,13 @@
         },
         "x-ms-examples": {
           "Creates or updates an environment.": {
-            "$ref": "./examples/EnvironmentsOperations_CreateOrUpdateEnvironment.json"
+            "$ref": "./examples/Environments_CreateOrReplaceEnvironment.json"
           }
         },
         "x-ms-long-running-operation": true
       },
       "delete": {
-        "operationId": "EnvironmentsOperations_DeleteEnvironment",
+        "operationId": "Environments_DeleteEnvironment",
         "description": "Deletes an environment and all its associated resources",
         "parameters": [
           {
@@ -1992,7 +1992,7 @@
         },
         "x-ms-examples": {
           "Deletes an environment and all its associated resources": {
-            "$ref": "./examples/EnvironmentsOperations_DeleteEnvironment.json"
+            "$ref": "./examples/Environments_DeleteEnvironment.json"
           }
         },
         "x-ms-long-running-operation": true
@@ -2000,7 +2000,7 @@
     },
     "/users/{userId}/devboxes": {
       "get": {
-        "operationId": "DevBoxesDevCenter_ListAllDevBoxesByUser",
+        "operationId": "DevCenter_ListAllDevBoxesByUser",
         "description": "Lists Dev Boxes in the Dev Center for a particular user.",
         "parameters": [
           {
@@ -2036,7 +2036,7 @@
         },
         "x-ms-examples": {
           "Lists Dev Boxes in the Dev Center for a particular user.": {
-            "$ref": "./examples/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json"
+            "$ref": "./examples/DevCenter_ListAllDevBoxesByUser.json"
           }
         },
         "x-ms-pageable": {
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_CreateDevBox.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_CreateDevBox.json
similarity index 97%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_CreateDevBox.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_CreateDevBox.json
index f51bad1c0086..c7e4037d4b1d 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_CreateDevBox.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_CreateDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Creates or replaces a Dev Box.",
-  "operationId": "DevBoxesOperations_CreateDevBox",
+  "operationId": "DevBoxes_CreateDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DelayAction.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DelayAction.json
similarity index 93%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DelayAction.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DelayAction.json
index db7107cfc6bc..6a5868c5ec6f 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DelayAction.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DelayAction.json
@@ -1,6 +1,6 @@
 {
   "title": "Delays the occurrence of an action.",
-  "operationId": "DevBoxesOperations_DelayAction",
+  "operationId": "DevBoxes_DelayAction",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DelayAllActions.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DelayActions.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DelayAllActions.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DelayActions.json
index 6a7ade1eef30..4a262b90f9a4 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_DelayAllActions.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DelayActions.json
@@ -1,6 +1,6 @@
 {
   "title": "Delays all actions.",
-  "operationId": "DevBoxesOperations_DelayAllActions",
+  "operationId": "DevBoxes_DelayActions",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DeleteDevBox.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DeleteDevBox.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DeleteDevBox.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DeleteDevBox.json
index 4843a80ed6c9..bf47f4e2ece2 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_DeleteDevBox.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_DeleteDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Deletes a Dev Box.",
-  "operationId": "DevBoxesOperations_DeleteDevBox",
+  "operationId": "DevBoxes_DeleteDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetDevBoxAction.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetAction.json
similarity index 91%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetDevBoxAction.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetAction.json
index 0d94918c712d..b876055179ad 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetDevBoxAction.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetAction.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets an action.",
-  "operationId": "DevBoxesOperations_GetDevBoxAction",
+  "operationId": "DevBoxes_GetAction",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetDevBox.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetDevBoxByUser.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetDevBox.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetDevBoxByUser.json
index f29193eb0b35..d4c50766da3f 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetDevBox.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetDevBoxByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a Dev Box",
-  "operationId": "DevBoxesOperations_GetDevBox",
+  "operationId": "DevBoxes_GetDevBoxByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetPool.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetPool.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetPool.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetPool.json
index 7b53a6ac96b4..3bd532947546 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetPool.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetPool.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a pool",
-  "operationId": "DevBoxesOperations_GetPool",
+  "operationId": "DevBoxes_GetPool",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetRemoteConnection.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetRemoteConnection.json
similarity index 87%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetRemoteConnection.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetRemoteConnection.json
index a01b7df571fd..3ff9f5a30770 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_GetRemoteConnection.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetRemoteConnection.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets RDP Connection info",
-  "operationId": "DevBoxesOperations_GetRemoteConnection",
+  "operationId": "DevBoxes_GetRemoteConnection",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetSchedule.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetScheduleByPool.json
similarity index 90%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetSchedule.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetScheduleByPool.json
index 8ba5489b95c6..24b194ccf289 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_GetSchedule.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_GetScheduleByPool.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a schedule.",
-  "operationId": "DevBoxesOperations_GetSchedule",
+  "operationId": "DevBoxes_GetScheduleByPool",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListDevBoxActions.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListActions.json
similarity index 94%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListDevBoxActions.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListActions.json
index db1ae0af7c62..cb83e457ecd9 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListDevBoxActions.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListActions.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists actions on a Dev Box.",
-  "operationId": "DevBoxesOperations_ListDevBoxActions",
+  "operationId": "DevBoxes_ListActions",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListDevBoxes.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListDevBoxesByUser.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListDevBoxes.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListDevBoxesByUser.json
index 2140a65cb857..7d0056e0593e 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesOperations_ListDevBoxes.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListDevBoxesByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists Dev Boxes in the project for a particular user.",
-  "operationId": "DevBoxesOperations_ListDevBoxes",
+  "operationId": "DevBoxes_ListDevBoxesByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListPools.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListPools.json
similarity index 97%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListPools.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListPools.json
index 42c39b484d20..f31808873991 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListPools.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListPools.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists available pools",
-  "operationId": "DevBoxesOperations_ListPools",
+  "operationId": "DevBoxes_ListPools",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListSchedules.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListSchedulesByPool.json
similarity index 91%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListSchedules.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListSchedulesByPool.json
index 0a5afd4f207a..1f97f0f41fe7 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_ListSchedules.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_ListSchedulesByPool.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists available schedules for a pool.",
-  "operationId": "DevBoxesOperations_ListSchedules",
+  "operationId": "DevBoxes_ListSchedulesByPool",
   "parameters": {
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
     "projectName": "myProject",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_RestartDevBox.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_RestartDevBox.json
similarity index 94%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_RestartDevBox.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_RestartDevBox.json
index 3c0e55515dd6..f9abacb1d881 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_RestartDevBox.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_RestartDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Restarts a Dev Box",
-  "operationId": "DevBoxesOperations_RestartDevBox",
+  "operationId": "DevBoxes_RestartDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_SkipAction.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_SkipAction.json
similarity index 88%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_SkipAction.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_SkipAction.json
index 1e8552d6bd35..b44cbd7dc65a 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_SkipAction.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_SkipAction.json
@@ -1,6 +1,6 @@
 {
   "title": "Skips an occurrence of an action.",
-  "operationId": "DevBoxesOperations_SkipAction",
+  "operationId": "DevBoxes_SkipAction",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_StartDevBox.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_StartDevBox.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_StartDevBox.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_StartDevBox.json
index 292e5e1c947a..462358dc151e 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_StartDevBox.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_StartDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Starts a Dev Box",
-  "operationId": "DevBoxesOperations_StartDevBox",
+  "operationId": "DevBoxes_StartDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_StopDevBox.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_StopDevBox.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_StopDevBox.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_StopDevBox.json
index b92d1089e864..eb10c60cf0c8 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesOperations_StopDevBox.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxes_StopDevBox.json
@@ -1,6 +1,6 @@
 {
   "title": "Stops a Dev Box",
-  "operationId": "DevBoxesOperations_StopDevBox",
+  "operationId": "DevBoxes_StopDevBox",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenterOperations_GetProject.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_GetProject.json
similarity index 87%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenterOperations_GetProject.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_GetProject.json
index fe1a721864bc..cc1f988275f0 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenterOperations_GetProject.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_GetProject.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets a project.",
-  "operationId": "DevCenterOperations_GetProject",
+  "operationId": "DevCenter_GetProject",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesDevCenterOperations_ListAllDevBoxes.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListAllDevBoxes.json
similarity index 95%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesDevCenterOperations_ListAllDevBoxes.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListAllDevBoxes.json
index 33e7210819fb..490fdc30c11a 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevBoxesDevCenterOperations_ListAllDevBoxes.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListAllDevBoxes.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists Dev Boxes that the caller has access to in the DevCenter.",
-  "operationId": "DevBoxesDevCenter_ListAllDevBoxes",
+  "operationId": "DevCenter_ListAllDevBoxes",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/"
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListAllDevBoxesByUser.json
similarity index 94%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListAllDevBoxesByUser.json
index 1fde15c1bbb5..84afde2e5cae 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevBoxesDevCenterOperations_ListAllDevBoxesByUser.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListAllDevBoxesByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists Dev Boxes in the Dev Center for a particular user.",
-  "operationId": "DevBoxesDevCenter_ListAllDevBoxesByUser",
+  "operationId": "DevCenter_ListAllDevBoxesByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/DevCenterOperations_ListProjects.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListProjects.json
similarity index 88%
rename from specification/devcenter/DevCenter/examples/2023-04-01/DevCenterOperations_ListProjects.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListProjects.json
index 1e7bdde95309..08b5c7d28016 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/DevCenterOperations_ListProjects.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/DevCenter_ListProjects.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all projects.",
-  "operationId": "DevCenterOperations_ListProjects",
+  "operationId": "DevCenter_ListProjects",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com"
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_CreateOrUpdateEnvironment.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_CreateOrReplaceEnvironment.json
similarity index 95%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_CreateOrUpdateEnvironment.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_CreateOrReplaceEnvironment.json
index 40bd8016a490..4fe037bc3d8a 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_CreateOrUpdateEnvironment.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_CreateOrReplaceEnvironment.json
@@ -1,6 +1,6 @@
 {
   "title": "Creates or updates an environment.",
-  "operationId": "EnvironmentsOperations_CreateOrUpdateEnvironment",
+  "operationId": "Environments_CreateOrReplaceEnvironment",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_DeleteEnvironment.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_DeleteEnvironment.json
similarity index 94%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_DeleteEnvironment.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_DeleteEnvironment.json
index db378d427835..2c6dec31e1f3 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_DeleteEnvironment.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_DeleteEnvironment.json
@@ -1,6 +1,6 @@
 {
   "title": "Deletes an environment and all its associated resources",
-  "operationId": "EnvironmentsOperations_DeleteEnvironment",
+  "operationId": "Environments_DeleteEnvironment",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetCatalog.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetCatalog.json
similarity index 87%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetCatalog.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetCatalog.json
index 7d9de8e13786..7a6ccf37974b 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetCatalog.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetCatalog.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets the specified catalog within the project",
-  "operationId": "EnvironmentsOperations_GetCatalog",
+  "operationId": "Environments_GetCatalog",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetEnvironment.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetEnvironmentByUser.json
similarity index 93%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetEnvironment.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetEnvironmentByUser.json
index eb89813acaf7..2268bb527cb7 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_GetEnvironment.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetEnvironmentByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Gets an environment",
-  "operationId": "EnvironmentsOperations_GetEnvironment",
+  "operationId": "Environments_GetEnvironmentByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetEnvironmentDefinition.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetEnvironmentDefinition.json
similarity index 96%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetEnvironmentDefinition.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetEnvironmentDefinition.json
index e4efa7edea54..e08ddd9df7f6 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_GetEnvironmentDefinition.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_GetEnvironmentDefinition.json
@@ -1,6 +1,6 @@
 {
   "title": "Get an environment definition from a catalog.",
-  "operationId": "EnvironmentsOperations_GetEnvironmentDefinition",
+  "operationId": "Environments_GetEnvironmentDefinition",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListCatalogs.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListCatalogsByProject.json
similarity index 88%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListCatalogs.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListCatalogsByProject.json
index 17c683e6c9b3..d4c4efe8440a 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListCatalogs.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListCatalogsByProject.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all of the catalogs available for a project.",
-  "operationId": "EnvironmentsOperations_ListCatalogs",
+  "operationId": "Environments_ListCatalogsByProject",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentDefinitionsByCatalog.json
similarity index 97%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentDefinitionsByCatalog.json
index d9c411224b8e..4c021662bf33 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentDefinitionsByCatalog.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all environment definitions available within a catalog.",
-  "operationId": "EnvironmentsOperations_ListEnvironmentDefinitionsByCatalog",
+  "operationId": "Environments_ListEnvironmentDefinitionsByCatalog",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentDefinitions.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentDefinitionsByProject.json
similarity index 97%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentDefinitions.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentDefinitionsByProject.json
index aabe3738602c..ad3f1b05bbe7 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironmentDefinitions.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentDefinitionsByProject.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all environment definitions available for a project.",
-  "operationId": "EnvironmentsOperations_ListEnvironmentDefinitions",
+  "operationId": "Environments_ListEnvironmentDefinitionsByProject",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentTypes.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentTypes.json
similarity index 89%
rename from specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentTypes.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentTypes.json
index 83e22df09846..364712b931e0 100644
--- a/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/EnvironmentsOperations_ListEnvironmentTypes.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentTypes.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists all environment types configured for a project.",
-  "operationId": "EnvironmentsOperations_ListEnvironmentTypes",
+  "operationId": "Environments_ListEnvironmentTypes",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListAllEnvironments.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironments.json
similarity index 93%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListAllEnvironments.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironments.json
index ab203c460a33..dbee94d1a1ea 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListAllEnvironments.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironments.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists the environments for a project.",
-  "operationId": "EnvironmentsOperations_ListAllEnvironments",
+  "operationId": "Environments_ListEnvironments",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironments.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentsByUser.json
similarity index 93%
rename from specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironments.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentsByUser.json
index 51f0384a6ffb..6d34c99ca04a 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/EnvironmentsOperations_ListEnvironments.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/Environments_ListEnvironmentsByUser.json
@@ -1,6 +1,6 @@
 {
   "title": "Lists the environments for a project and user.",
-  "operationId": "EnvironmentsOperations_ListEnvironments",
+  "operationId": "Environments_ListEnvironmentsByUser",
   "parameters": {
     "api-version": "2023-04-01",
     "endpoint": "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/",
diff --git a/specification/devcenter/DevCenter/examples/2023-04-01/SharedOperations_GetProjectOperationStatus.json b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/OperationStatuses_Get.json
similarity index 88%
rename from specification/devcenter/DevCenter/examples/2023-04-01/SharedOperations_GetProjectOperationStatus.json
rename to specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/OperationStatuses_Get.json
index d6c4b10ab2f4..5eb732d0c312 100644
--- a/specification/devcenter/DevCenter/examples/2023-04-01/SharedOperations_GetProjectOperationStatus.json
+++ b/specification/devcenter/data-plane/Microsoft.DevCenter/stable/2023-04-01/examples/OperationStatuses_Get.json
@@ -1,6 +1,6 @@
 {
   "title": "Get the status of an operation.",
-  "operationId": "SharedOperations_GetProjectOperationStatus",
+  "operationId": "OperationStatuses_Get",
   "parameters": {
     "api-version": "2023-04-01",
     "projectName": "myProject",
diff --git a/specification/devcenter/data-plane/readme.md b/specification/devcenter/data-plane/readme.md
index 1a2a95ddb94e..165301f3859c 100644
--- a/specification/devcenter/data-plane/readme.md
+++ b/specification/devcenter/data-plane/readme.md
@@ -101,6 +101,8 @@ input-file:
 directive:
   - suppress: HostParametersValidation
     reason: Requires URL format for endpoint params, which violates R2003 and causes problems with codegen
+  - suppress: OperationIdNounVerb
+    reason: DevBoxes and Environments are operations with multiple models.
 ```
 
 ### Tag: 2023-01-01-preview