diff --git a/specification/cognitiveservices/AnomalyDetector/main.tsp b/specification/cognitiveservices/AnomalyDetector/main.tsp
index 7fa89f59f03d..b3e3f3e85785 100644
--- a/specification/cognitiveservices/AnomalyDetector/main.tsp
+++ b/specification/cognitiveservices/AnomalyDetector/main.tsp
@@ -19,7 +19,7 @@ using TypeSpec.Versioning;
       Supported Azure Cognitive Services endpoints (protocol and host name, such as
       https://westus2.api.cognitive.microsoft.com).
       """)
-    Endpoint: string,
+    Endpoint: url,
 
     @doc("Api Version")
     @path
diff --git a/specification/cognitiveservices/ContentSafety/main.tsp b/specification/cognitiveservices/ContentSafety/main.tsp
index b4fd63c01ab5..d199ea250500 100644
--- a/specification/cognitiveservices/ContentSafety/main.tsp
+++ b/specification/cognitiveservices/ContentSafety/main.tsp
@@ -29,7 +29,7 @@ using Azure.Core;
       Supported Cognitive Services endpoints (protocol and hostname, for example:
       https://<resource-name>.cognitiveservices.azure.com).
       """)
-    endpoint: string,
+    endpoint: url,
   }
 )
 @doc("Analyze harmful content")
diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json
index 3a7ae26d1e7a..876912fa052c 100644
--- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json
@@ -22,7 +22,9 @@
         "in": "path",
         "description": "Supported Azure Cognitive Services endpoints (protocol and host name, such as\nhttps://westus2.api.cognitive.microsoft.com).",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       },
       {
         "name": "ApiVersion",
diff --git a/specification/cognitiveservices/data-plane/ContentSafety/stable/2023-10-01/contentsafety.json b/specification/cognitiveservices/data-plane/ContentSafety/stable/2023-10-01/contentsafety.json
index 8cf88b1344a8..0641261a5b8e 100644
--- a/specification/cognitiveservices/data-plane/ContentSafety/stable/2023-10-01/contentsafety.json
+++ b/specification/cognitiveservices/data-plane/ContentSafety/stable/2023-10-01/contentsafety.json
@@ -22,7 +22,9 @@
         "in": "path",
         "description": "Supported Cognitive Services endpoints (protocol and hostname, for example:\nhttps://<resource-name>.cognitiveservices.azure.com).",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/cognitiveservices/data-plane/ContentSafety/stable/2024-09-01/contentsafety.json b/specification/cognitiveservices/data-plane/ContentSafety/stable/2024-09-01/contentsafety.json
index 2ca64c71653e..e8028cf3569e 100644
--- a/specification/cognitiveservices/data-plane/ContentSafety/stable/2024-09-01/contentsafety.json
+++ b/specification/cognitiveservices/data-plane/ContentSafety/stable/2024-09-01/contentsafety.json
@@ -22,7 +22,9 @@
         "in": "path",
         "description": "Supported Cognitive Services endpoints (protocol and hostname, for example:\nhttps://<resource-name>.cognitiveservices.azure.com).",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/communication/Communication.JobRouter/client.tsp b/specification/communication/Communication.JobRouter/client.tsp
index 93dd50c95839..49888fa34e81 100644
--- a/specification/communication/Communication.JobRouter/client.tsp
+++ b/specification/communication/Communication.JobRouter/client.tsp
@@ -3,6 +3,7 @@ import "@azure-tools/typespec-client-generator-core";
 import "@typespec/versioning";
 
 import "./main.tsp";
+import "./models.tsp";
 
 using Azure.ClientGenerator.Core;
 using TypeSpec.Versioning;
@@ -142,3 +143,13 @@ interface JobRouterRestClient {
   @access(Access.internal, "csharp")
   listWorkers is AzureCommunicationRoutingService.JobRouterOperations.listWorkers;
 }
+
+// Remove the leading "c" in the version enum identifiers for C#
+@@clientName(AzureCommunicationRoutingService.Versions.c2023_11_01,
+  "2023_11_01",
+  "csharp"
+);
+@@clientName(AzureCommunicationRoutingService.Versions.c2024_01_18_Preview,
+  "2024_01_18_Preview",
+  "csharp"
+);
diff --git a/specification/communication/Communication.JobRouter/main.tsp b/specification/communication/Communication.JobRouter/main.tsp
index 9d14ed5abc8f..f9a437e81d75 100644
--- a/specification/communication/Communication.JobRouter/main.tsp
+++ b/specification/communication/Communication.JobRouter/main.tsp
@@ -20,7 +20,7 @@ using Azure.Core.Traits;
   "Azure Communication Routing Service",
   {
     @doc("Uri of your Communication resource")
-    endpoint: string,
+    endpoint: url,
   }
 )
 @versioned(Versions)
diff --git a/specification/communication/data-plane/JobRouter/preview/2024-01-18-preview/communicationservicejobrouter.json b/specification/communication/data-plane/JobRouter/preview/2024-01-18-preview/communicationservicejobrouter.json
index 881d5ab0a274..512c6ae00d44 100644
--- a/specification/communication/data-plane/JobRouter/preview/2024-01-18-preview/communicationservicejobrouter.json
+++ b/specification/communication/data-plane/JobRouter/preview/2024-01-18-preview/communicationservicejobrouter.json
@@ -22,7 +22,9 @@
         "in": "path",
         "description": "Uri of your Communication resource",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/communication/data-plane/JobRouter/stable/2023-11-01/communicationservicejobrouter.json b/specification/communication/data-plane/JobRouter/stable/2023-11-01/communicationservicejobrouter.json
index c0cd10e048d1..76ac53676d1f 100644
--- a/specification/communication/data-plane/JobRouter/stable/2023-11-01/communicationservicejobrouter.json
+++ b/specification/communication/data-plane/JobRouter/stable/2023-11-01/communicationservicejobrouter.json
@@ -22,7 +22,9 @@
         "in": "path",
         "description": "Uri of your Communication resource",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/main.tsp b/specification/loadtestservice/data-plane/loadtesting/main.tsp
index d9480301778d..1f00f5bf5349 100644
--- a/specification/loadtestservice/data-plane/loadtesting/main.tsp
+++ b/specification/loadtestservice/data-plane/loadtesting/main.tsp
@@ -15,7 +15,7 @@ using Azure.Core;
   "https://{endpoint}",
   "These APIs allow end users to create, view and run load tests using Azure Load Test Service.",
   {
-    endpoint: string,
+    endpoint: url,
   }
 )
 @doc("""
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2023-04-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2023-04-01-preview/loadtestservice.json
index a9ea2842ce45..5f10fb91e21a 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2023-04-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2023-04-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2024-03-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2024-03-01-preview/loadtestservice.json
index 9ab02f81b5e1..e61e1fcf488e 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2024-03-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2024-03-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2024-05-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2024-05-01-preview/loadtestservice.json
index 440f192ae406..d61fa5c13454 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2024-05-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2024-05-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2024-07-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2024-07-01-preview/loadtestservice.json
index 1d046d16ff86..3db944725a86 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2024-07-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2024-07-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2024-12-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2024-12-01-preview/loadtestservice.json
index ea3e26de3e3c..e56fb779843b 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2024-12-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2024-12-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2025-03-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2025-03-01-preview/loadtestservice.json
index 13f1c77a91fd..21765729139f 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2025-03-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2025-03-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/preview/2025-11-01-preview/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/preview/2025-11-01-preview/loadtestservice.json
index d359afbbc259..be9551b721cd 100644
--- a/specification/loadtestservice/data-plane/loadtesting/preview/2025-11-01-preview/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/preview/2025-11-01-preview/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },
diff --git a/specification/loadtestservice/data-plane/loadtesting/stable/2022-11-01/loadtestservice.json b/specification/loadtestservice/data-plane/loadtesting/stable/2022-11-01/loadtestservice.json
index f5b69d5c5792..b619382c631d 100644
--- a/specification/loadtestservice/data-plane/loadtesting/stable/2022-11-01/loadtestservice.json
+++ b/specification/loadtestservice/data-plane/loadtesting/stable/2022-11-01/loadtestservice.json
@@ -21,7 +21,9 @@
         "name": "endpoint",
         "in": "path",
         "required": true,
-        "type": "string"
+        "type": "string",
+        "format": "uri",
+        "x-ms-skip-url-encoding": true
       }
     ]
   },