diff --git a/specification/fileshares/FileShares.Management/client.tsp b/specification/fileshares/FileShares.Management/client.tsp
new file mode 100644
index 000000000000..dfaa6bcceffa
--- /dev/null
+++ b/specification/fileshares/FileShares.Management/client.tsp
@@ -0,0 +1,29 @@
+import "./main.tsp";
+import "@azure-tools/typespec-client-generator-core";
+
+using Azure.ClientGenerator.Core;
+using Azure.ResourceManager.Foundations;
+
+@@clientName(Microsoft.FileShares, "FileSharesManagementClient", "java");
+
+@@clientName(CheckNameAvailabilityResponse,
+  "CheckNameAvailabilityResult",
+  "csharp"
+);
+
+@@clientName(Microsoft.FileShares.FileShareLimitsResponse,
+  "FileShareLimitsResult",
+  "csharp"
+);
+
+@@clientName(Microsoft.FileShares.FileShareProvisioningRecommendationResponse,
+  "FileShareProvisioningRecommendationResult",
+  "csharp"
+);
+
+@@clientName(Microsoft.FileShares.FileShareUsageDataResponse,
+  "FileShareUsageDataResult",
+  "csharp"
+);
+
+@@clientName(Azure.ResourceManager.CommonTypes.Operation, "Info", "csharp");
diff --git a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_CreateOrUpdate_MaximumSet_Gen.json b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_CreateOrUpdate_MaximumSet_Gen.json
index 0f3d0ab03371..59bbbb314ddd 100644
--- a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_CreateOrUpdate_MaximumSet_Gen.json
@@ -65,7 +65,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -141,7 +141,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -182,4 +182,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Get_MaximumSet_Gen.json b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Get_MaximumSet_Gen.json
index ecffc332bded..80fd75c10a90 100644
--- a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Get_MaximumSet_Gen.json
+++ b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Get_MaximumSet_Gen.json
@@ -41,7 +41,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -82,4 +82,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListByParent_MaximumSet_Gen.json b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListByParent_MaximumSet_Gen.json
index d7a0845f7e99..6f1a5b61d124 100644
--- a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListByParent_MaximumSet_Gen.json
+++ b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListByParent_MaximumSet_Gen.json
@@ -42,7 +42,7 @@
                       "ndoii"
                     ],
                     "privateEndpoint": {
-                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                     },
                     "privateLinkServiceConnectionState": {
                       "status": "Pending",
@@ -86,4 +86,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListBySubscription_MaximumSet_Gen.json b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListBySubscription_MaximumSet_Gen.json
index a1153809b236..f7c083c7e18c 100644
--- a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListBySubscription_MaximumSet_Gen.json
+++ b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_ListBySubscription_MaximumSet_Gen.json
@@ -41,7 +41,7 @@
                       "ndoii"
                     ],
                     "privateEndpoint": {
-                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                     },
                     "privateLinkServiceConnectionState": {
                       "status": "Pending",
@@ -50,9 +50,9 @@
                     },
                     "provisioningState": "Succeeded"
                   },
-                "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName",
-                "name": "kjavgkroj",
-                "type": "fstofkkxhkztjruqrkhoneowfapqf",
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName",
+                  "name": "kjavgkroj",
+                  "type": "fstofkkxhkztjruqrkhoneowfapqf",
                   "systemData": {
                     "createdBy": "moat",
                     "createdByType": "User",
@@ -85,4 +85,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Update_MaximumSet_Gen.json b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Update_MaximumSet_Gen.json
index 1d330dee1f61..6cf61cc8a306 100644
--- a/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Update_MaximumSet_Gen.json
+++ b/specification/fileshares/FileShares.Management/examples/2025-06-01-preview/FileShares_Update_MaximumSet_Gen.json
@@ -60,7 +60,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -106,4 +106,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_CreateOrUpdate_MaximumSet_Gen.json b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_CreateOrUpdate_MaximumSet_Gen.json
index 0f3d0ab03371..59bbbb314ddd 100644
--- a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_CreateOrUpdate_MaximumSet_Gen.json
@@ -65,7 +65,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -141,7 +141,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -182,4 +182,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Get_MaximumSet_Gen.json b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Get_MaximumSet_Gen.json
index ecffc332bded..80fd75c10a90 100644
--- a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Get_MaximumSet_Gen.json
+++ b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Get_MaximumSet_Gen.json
@@ -41,7 +41,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -82,4 +82,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListByParent_MaximumSet_Gen.json b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListByParent_MaximumSet_Gen.json
index d7a0845f7e99..6f1a5b61d124 100644
--- a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListByParent_MaximumSet_Gen.json
+++ b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListByParent_MaximumSet_Gen.json
@@ -42,7 +42,7 @@
                       "ndoii"
                     ],
                     "privateEndpoint": {
-                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                     },
                     "privateLinkServiceConnectionState": {
                       "status": "Pending",
@@ -86,4 +86,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListBySubscription_MaximumSet_Gen.json b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListBySubscription_MaximumSet_Gen.json
index a1153809b236..f7c083c7e18c 100644
--- a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListBySubscription_MaximumSet_Gen.json
+++ b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_ListBySubscription_MaximumSet_Gen.json
@@ -41,7 +41,7 @@
                       "ndoii"
                     ],
                     "privateEndpoint": {
-                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                      "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                     },
                     "privateLinkServiceConnectionState": {
                       "status": "Pending",
@@ -50,9 +50,9 @@
                     },
                     "provisioningState": "Succeeded"
                   },
-                "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName",
-                "name": "kjavgkroj",
-                "type": "fstofkkxhkztjruqrkhoneowfapqf",
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName",
+                  "name": "kjavgkroj",
+                  "type": "fstofkkxhkztjruqrkhoneowfapqf",
                   "systemData": {
                     "createdBy": "moat",
                     "createdByType": "User",
@@ -85,4 +85,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Update_MaximumSet_Gen.json b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Update_MaximumSet_Gen.json
index 1d330dee1f61..6cf61cc8a306 100644
--- a/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Update_MaximumSet_Gen.json
+++ b/specification/fileshares/resource-manager/Microsoft.FileShares/preview/2025-06-01-preview/examples/FileShares_Update_MaximumSet_Gen.json
@@ -60,7 +60,7 @@
                   "ndoii"
                 ],
                 "privateEndpoint": {
-                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.FileShares/fileShares/testresourcename/privateEndpointConnections/privateEndpointConnectionName"
+                  "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/examples-rg/providers/Microsoft.Network/privateEndpoints/testresourcename"
                 },
                 "privateLinkServiceConnectionState": {
                   "status": "Pending",
@@ -106,4 +106,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}