diff --git a/specification/computeschedule/ComputeSchedule.Management/client.tsp b/specification/computeschedule/ComputeSchedule.Management/client.tsp
index 423accfb3ef7..1fd43d6fcd97 100644
--- a/specification/computeschedule/ComputeSchedule.Management/client.tsp
+++ b/specification/computeschedule/ComputeSchedule.Management/client.tsp
@@ -3,6 +3,7 @@ import "@azure-tools/typespec-client-generator-core";
 
 using Azure.ClientGenerator.Core;
 using Microsoft.ComputeSchedule;
+using Azure.ResourceManager;
 
 @@clientName(Microsoft.ComputeSchedule, "ComputeScheduleMgmtClient", "python");
 @@clientName(Microsoft.ComputeSchedule, "ComputeScheduleMgmtClient", "java");
@@ -173,7 +174,7 @@ using Microsoft.ComputeSchedule;
   "ScheduledActionResourceOperationResult",
   "csharp"
 );
-@@clientName(Azure.ResourceManager.ResourceProvisioningState,
+@@clientName(ResourceProvisioningState,
   "OccurrenceResourceProvisioningState",
   "csharp"
 );
@@ -188,15 +189,15 @@ using Microsoft.ComputeSchedule;
 );
 @@clientName(OccurrenceState, "ScheduledActionOccurrenceState", "csharp");
 @@clientName(ResourceAttachRequest,
-  "ScheduledActionResourceAttachRequest",
+  "ScheduledActionResourceAttachContent",
   "csharp"
 );
 @@clientName(ResourceDetachRequest,
-  "ScheduledActionResourceDetachRequest",
+  "ScheduledActionResourceDetachContent",
   "csharp"
 );
 @@clientName(ResourcePatchRequest,
-  "ScheduledActionResourcePatchRequest",
+  "ScheduledActionResourcePatchContent",
   "csharp"
 );
 @@clientName(ResourceStatus, "ScheduledActionResourceStatus", "csharp");
@@ -226,3 +227,18 @@ using Microsoft.ComputeSchedule;
   "javascript"
 );
 @@clientName(Microsoft.ComputeSchedule.ActionType, "ScheduledActionType");
+
+@@clientName(SubmitDeallocateRequest, "SubmitDeallocateContent");
+@@clientName(ExecuteHibernateRequest, "ExecuteHibernateContent");
+@@clientName(CancelOperationsRequest, "CancelOperationsContent");
+@@clientName(ExecuteCreateRequest, "ExecuteCreateContent");
+@@clientName(ExecuteDeallocateRequest, "ExecuteDeallocateContent");
+@@clientName(ExecuteDeleteRequest, "ExecuteDeleteContent");
+@@clientName(ExecuteStartRequest, "ExecuteStartContent");
+@@clientName(GetOperationErrorsRequest, "GetOperationErrorsContent");
+@@clientName(GetOperationStatusRequest, "GetOperationStatusContent");
+@@clientName(SubmitStartRequest, "SubmitStartContent");
+@@clientName(SubmitHibernateRequest, "SubmitHibernateContent");
+@@clientName(ScheduledActionsExtensionProperties,
+  "ScheduledActionsExtensionProperties"
+);
diff --git a/specification/computeschedule/ComputeSchedule.Management/tspconfig.yaml b/specification/computeschedule/ComputeSchedule.Management/tspconfig.yaml
index ef83d643d8a1..ba6b11ddbb83 100644
--- a/specification/computeschedule/ComputeSchedule.Management/tspconfig.yaml
+++ b/specification/computeschedule/ComputeSchedule.Management/tspconfig.yaml
@@ -21,11 +21,6 @@ options:
     flavor: azure
     package-details:
       name: "@azure/arm-computeschedule"
-  "@azure-tools/typespec-csharp":
-    emitter-output-dir: "{output-dir}/{service-dir}/{namespace}"
-    flavor: azure
-    clear-output-folder: true
-    namespace: "Azure.ResourceManager.ComputeSchedule"
   "@azure-tools/typespec-java":
     emitter-output-dir: "{output-dir}/{service-dir}/azure-resourcemanager-computeschedule"
     namespace: "com.azure.resourcemanager.computeschedule"
@@ -41,6 +36,9 @@ options:
     generate-fakes: true
     head-as-boolean: true
     inject-spans: true
+  "@azure-typespec/http-client-csharp-mgmt":
+    namespace: "Azure.ResourceManager.ComputeSchedule"
+    emitter-output-dir: "{output-dir}/sdk/computeschedule/{namespace}"
 linter:
   extends:
     - "@azure-tools/typespec-azure-rulesets/resource-manager"