diff --git a/specification/iotoperations/IoTOperations.Management/client.tsp b/specification/iotoperations/IoTOperations.Management/client.tsp
index 53e7a51ffa8c..2bdc190a684a 100644
--- a/specification/iotoperations/IoTOperations.Management/client.tsp
+++ b/specification/iotoperations/IoTOperations.Management/client.tsp
@@ -30,6 +30,10 @@ using Microsoft.IoTOperations;
   "IotOperationsBrokerListenerProperties",
   "csharp"
 );
+@@clientName(BrokerListenerProperties.serviceType,
+  "ListenerServiceType",
+  "csharp"
+);
 @@clientName(BrokerResource, "IotOperationsBroker", "csharp");
 @@clientName(BrokerProperties, "IotOperationsBrokerProperties", "csharp");
 @@clientName(DataflowEndpointResource,
@@ -73,18 +77,24 @@ using Microsoft.IoTOperations;
 @@clientName(MetricProperties, "IotOperationsMetricsProperties", "csharp");
 @@clientName(OperationalMode, "IotOperationsOperationalMode", "csharp");
 @@clientName(OperationType, "DataflowOperationType", "csharp");
-@@clientName(OperatorValues, "BrokerOperatorValues", "csharp");
+@@clientName(OperatorValues, "BrokerOperatorValue", "csharp");
 @@clientName(PrincipalDefinition, "PrincipalConfig", "csharp");
 @@clientName(ProfileDiagnostics, "DataflowProfileDiagnostics", "csharp");
 @@clientName(ProvisioningState, "IotOperationsProvisioningState", "csharp");
 @@clientName(SelfCheck, "BrokerDiagnosticSelfCheck", "csharp");
 @@clientName(SelfTracing, "DiagnosticSelfTracing", "csharp");
-@@clientName(ServiceType, "BlockerListenerServiceType", "csharp");
+@@clientName(ServiceType, "BrokerListenerServiceType", "csharp");
+@@clientName(ServiceType.ClusterIp, "ClusterIP", "csharp");
 @@clientName(SourceSerializationFormat,
   "DataflowSourceSerializationFormat",
   "csharp"
 );
+@@clientName(BrokerAuthenticatorValidationMethods,
+  "BrokerAuthenticatorValidationMethod",
+  "csharp"
+);
 @@clientName(TlsCertMethod, "ListenerPortTlsCertMethod", "csharp");
+@@clientName(X509ManualCertificate, "BrokerX509ManualCertificate", "csharp");
 @@clientName(TlsProperties, "IotOperationsTlsProperties", "csharp");
 @@clientName(Traces, "BrokerDiagnosticTraces", "csharp");
 @@clientName(AkriConnectorResource, "IotOperationsAkriConnector", "csharp");
@@ -113,6 +123,17 @@ using Microsoft.IoTOperations;
   "IotOperationsRegistryEndpointProperties",
   "csharp"
 );
+@@clientName(BrokerResourceDefinitionMethods,
+  "BrokerResourceDefinitionMethod",
+  "csharp"
+);
+@@clientName(DataflowEndpointKafkaAcks, "DataflowEndpointKafkaAck", "csharp");
+@@clientName(SanForCert.ip, "IP", "csharp");
+@@clientName(StateStoreResourceDefinitionMethods,
+  "StateStoreResourceDefinitionMethod",
+  "csharp"
+);
+@@clientName(StateStoreResourceKeyTypes, "StateStoreResourceKeyType", "csharp");
 
 @@clientName(Versions.`2024-11-01`,
   "$DO_NOT_NORMALIZE$V2024-11-01",
diff --git a/specification/iotoperations/IoTOperations.Management/tspconfig.yaml b/specification/iotoperations/IoTOperations.Management/tspconfig.yaml
index a6f64d2c77f6..96a013a0ee3b 100644
--- a/specification/iotoperations/IoTOperations.Management/tspconfig.yaml
+++ b/specification/iotoperations/IoTOperations.Management/tspconfig.yaml
@@ -9,11 +9,9 @@ options:
     azure-resource-provider-folder: "resource-manager"
     output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/iotoperations.json"
     use-read-only-status-schema: true
-  "@azure-tools/typespec-csharp":
-    emitter-output-dir: "{output-dir}/{service-dir}/{namespace}"
-    flavor: azure
-    clear-output-folder: true
+  "@azure-typespec/http-client-csharp-mgmt":
     namespace: "Azure.ResourceManager.IotOperations"
+    emitter-output-dir: "{output-dir}/{service-dir}/{namespace}"
   "@azure-tools/typespec-python":
     emitter-output-dir: "{output-dir}/{service-dir}/azure-mgmt-iotoperations"
     namespace: "azure.mgmt.iotoperations"