diff --git a/specification/storage/Storage.Management/client.tsp b/specification/storage/Storage.Management/client.tsp
index a8beef548341..2b8794cedfd7 100644
--- a/specification/storage/Storage.Management/client.tsp
+++ b/specification/storage/Storage.Management/client.tsp
@@ -113,10 +113,14 @@ using Microsoft.Storage;
 @@clientName(LeaseShareRequest, "LeaseShareContent", "csharp");
 @@clientName(ListAccountSasResponse, "GetAccountSasResult", "csharp");
 @@clientName(ListServiceSasResponse, "GetServiceSasResult", "csharp");
-@@clientName(TestConnectionResponse, "TestConnectionResult", "csharp");
+@@clientName(
+  TestConnectionResponse,
+  "StorageConnectorTestConnectionResult",
+  "csharp"
+);
 @@clientName(
   TestExistingConnectionRequest,
-  "TestExistingConnectionContent",
+  "StorageConnectorTestExistingConnectionContent",
   "csharp"
 );
 @@clientName(
@@ -814,6 +818,57 @@ namespace Azure.ResourceManager.Models {
   "IsPriorityReplicationEnabled",
   "csharp"
 );
+@@clientName(
+  ObjectReplicationPolicyPropertiesTagsReplication.enabled,
+  "IsTagsReplicationEnabled",
+  "csharp"
+);
+
+// Native data sharing patch model naming
+@@clientName(TrackedResourceUpdate, "StorageTrackedResourcePatch", "csharp");
+@@clientName(
+  StorageConnectorAuthPropertiesUpdate,
+  "StorageConnectorAuthPropertiesPatch",
+  "csharp"
+);
+@@clientName(
+  StorageConnectorSourceUpdate,
+  "StorageConnectorSourcePatch",
+  "csharp"
+);
+@@clientName(DataShareSourceUpdate, "DataShareSourcePatch", "csharp");
+@@clientName(
+  ManagedIdentityAuthProperties,
+  "StorageConnectorManagedIdentityAuth",
+  "csharp"
+);
+@@clientName(
+  ManagedIdentityAuthPropertiesUpdate,
+  "StorageConnectorManagedIdentityAuthPatch",
+  "csharp"
+);
+@@clientName(
+  StorageConnectorPropertiesUpdate,
+  "StorageConnectorPropertiesPatch",
+  "csharp"
+);
+@@clientName(
+  StorageDataSharePropertiesUpdate,
+  "StorageDataSharePropertiesPatch",
+  "csharp"
+);
+
+// Native data sharing property renames/types
+@@clientName(
+  StorageConnectorProperties.testConnection,
+  "ShouldTestConnection",
+  "csharp"
+);
+@@clientName(
+  StorageConnectorPropertiesUpdate.testConnection,
+  "ShouldTestConnection",
+  "csharp"
+);
 
 // LocalUser property renames
 @@clientName(