diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceCheckNameAvailability.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceCheckNameAvailability.json
new file mode 100644
index 000000000000..fd1064c21bc5
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceCheckNameAvailability.json
@@ -0,0 +1,19 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "api-version": "2015-10-01",
+    "parameters": {
+      "name": "contosomedia",
+      "type": "mediaservices"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "nameAvailable": true,
+        "reason": "None",
+        "message": ""
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceCreate.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceCreate.json
new file mode 100644
index 000000000000..b859bba032f3
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceCreate.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01",
+    "parameters": {
+      "location": "West US",
+      "properties": {
+         "storageAccounts": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore",
+            "isPrimary": true
+          }
+        ]
+      }
+    }
+  }, 
+  "responses": {
+    "201": {
+      "body": {
+        "location": "West US",
+        "properties": {
+           "storageAccounts": [
+            {
+              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore",
+              "isPrimary": true
+            }
+          ]
+        }
+      }
+    }
+  }
+}
+    
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceDelete.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceDelete.json
new file mode 100644
index 000000000000..29e5ea14f3d3
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceDelete.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01"
+  },
+  "responses": {
+    "200": {
+      "body": ""
+    },
+    "204": {
+      "body": ""
+    }
+  }
+}
+    
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceGet.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceGet.json
new file mode 100644
index 000000000000..589d3618bc9f
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceGet.json
@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "contosmedia",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/contosoresources/providers/Microsoft.Media/mediaservices/contosmedia",
+        "type": "Microsoft.Media/mediaservices",
+        "tags": [],
+        "location": "East US",
+        "properties": {
+          "apiEndpoints": [
+            {
+              "endpoint": "https://contosmedia.restv2.eastus.media.azure.net/api/",
+              "majorVersion": "2"
+            }
+          ],
+          "storageAccounts": [
+            {
+              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore",
+              "isPrimary": true
+            }
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceListByResourceGroup.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceListByResourceGroup.json
new file mode 100644
index 000000000000..5f1f3b9a468e
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceListByResourceGroup.json
@@ -0,0 +1,57 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "api-version": "2015-10-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "contosmedia",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/contosoresources/providers/Microsoft.Media/mediaservices/contosmedia",
+            "type": "Microsoft.Media/mediaservices",
+            "tags": [],
+            "location": "East US",
+            "properties": {
+              "apiEndpoints": [
+                {
+                  "endpoint": "https://contosmedia.restv2.eastus.media.azure.net/api/",
+                  "majorVersion": "2"
+                }
+              ],
+              "storageAccounts": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore",
+                  "isPrimary": true
+                }
+              ]
+            }
+          },
+          {
+            "name": "contosmedia2",
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/contosoresources/providers/Microsoft.Media/mediaservices/contosmedia2",
+            "type": "Microsoft.Media/mediaservices",
+            "tags": [],
+            "location": "West US",
+            "properties": {
+              "apiEndpoints": [
+                {
+                  "endpoint": "https://contosmedia2.restv2.westus.media.azure.net/api/",
+                  "majorVersion": "2"
+                }
+              ],
+              "storageAccounts": [
+                {
+                  "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/microsoft.storage/storageAccounts/contosostore2",
+                  "isPrimary": true
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceListKeys.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceListKeys.json
new file mode 100644
index 000000000000..111b60e1d127
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceListKeys.json
@@ -0,0 +1,19 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "primaryAuthEndpoint": "https://wamsprodglobal001acs.accesscontrol.windows.net/",
+        "secondaryAuthEndpoint": "https://wamsprodglobal002acs.accesscontrol.windows.net/",
+        "primaryKey": "<primary key value>",
+        "secondaryKey": "<secondary key value>",
+        "scope": "urn:windowsazuremediaservices"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceRegenerateKey.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceRegenerateKey.json
new file mode 100644
index 000000000000..65e2f4ef9fe5
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceRegenerateKey.json
@@ -0,0 +1,19 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01",
+    "parameters": {
+      "keyType": "Primary"
+    }
+  }, 
+  "responses": {
+    "200": {
+      "body": {
+        "key":"<key value>"
+      }
+    }
+  }
+}
+    
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceSyncStorageKeys.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceSyncStorageKeys.json
new file mode 100644
index 000000000000..1e8d17789fc8
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceSyncStorageKeys.json
@@ -0,0 +1,17 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01",
+    "parameters": {
+      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore"
+    }
+  }, 
+  "responses": {
+    "200": {
+      "body": ""
+    }
+  }
+}
+    
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceUpdate.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceUpdate.json
new file mode 100644
index 000000000000..225fc4e84743
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/MediaServiceUpdate.json
@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "subscriptionId": "00000000-0000-0000-0000-000000000000",
+    "resourceGroupName": "contosoresources",
+    "mediaServiceName": "contosmedia",
+    "api-version": "2015-10-01",
+    "parameters": {
+      "location": "West US",
+      "properties": {
+         "storageAccounts": [
+          {
+            "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore",
+            "isPrimary": true
+          }
+        ]
+      }
+    }
+  }, 
+  "responses": {
+    "200": {
+      "body": {
+        "location": "West US",
+        "properties": {
+           "storageAccounts": [
+            {
+              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosostore",
+              "isPrimary": true
+            }
+          ]
+        }
+      }
+    }
+  }
+}
+    
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/OperationsList.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/OperationsList.json
new file mode 100644
index 000000000000..275347bc21bc
--- /dev/null
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/examples/OperationsList.json
@@ -0,0 +1,61 @@
+{
+  "parameters": {
+    "api-version": "2015-10-01"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "name": "Microsoft.Media/mediaservices/read",
+            "display": {
+              "provider": "Microsoft.Media",
+              "resource": "MediaService",
+              "operation": "read"
+            }
+          },
+          {
+            "name": "Microsoft.Media/mediaservices/write",
+            "display": {
+              "provider": "Microsoft.Media",
+              "resource": "MediaService",
+              "operation": "write"
+            }
+          },
+          {
+            "name": "Microsoft.Media/mediaservices/delete",
+            "display": {
+              "provider": "Microsoft.Media",
+              "resource": "MediaService",
+              "operation": "delete"
+            }
+          },
+          {
+            "name": "Microsoft.Media/mediaservices/regenerateKey/action",
+            "display": {
+              "provider": "Microsoft.Media",
+              "resource": "MediaService",
+              "operation": "regenerateKey"
+            }
+          },
+          {
+            "name": "Microsoft.Media/mediaservices/listKeys/action",
+            "display": {
+              "provider": "Microsoft.Media",
+              "resource": "MediaService",
+              "operation": "listKeys"
+            }
+          },
+          {
+            "name": "Microsoft.Media/mediaservices/syncStorageKeys/action",
+            "display": {
+              "provider": "Microsoft.Media",
+              "resource": "MediaService",
+              "operation": "syncStorageKeys"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/media.json b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/media.json
index 30433b37a5a1..300c66244063 100644
--- a/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/media.json
+++ b/specification/mediaservices/resource-manager/Microsoft.Media/2015-10-01/media.json
@@ -34,6 +34,31 @@
     }
   },
   "paths": {
+    "/providers/Microsoft.Media/operations": {
+      "get": {
+        "operationId": "Operations_List",
+        "description": "Lists all of the available Media Services REST API operations.",
+        "externalDocs": {
+          "url": "https://aka.ms/media-manage"
+        },
+        "x-ms-examples": {
+          "OperationsList": { "$ref": "./examples/OperationsList.json" }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success. Returns a list of operations.",
+            "schema": {
+              "$ref": "#/definitions/OperationListResult"
+            }
+          }
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/providers/Microsoft.Media/CheckNameAvailability": {
       "post": {
         "operationId": "MediaService_CheckNameAvailability",
@@ -41,6 +66,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceCheckNameAvailability": { "$ref": "./examples/MediaServiceCheckNameAvailability.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -49,14 +77,14 @@
             "$ref": "#/parameters/apiVersionParameter"
           },
           {
-            "name": "CheckNameAvailabilityInput",
+            "name": "parameters",
             "description": "Properties needed to check the availability of a name.",
             "in": "body",
             "required": true,
             "schema": {
               "$ref": "#/definitions/CheckNameAvailabilityInput"
             }
-         }
+          }
         ],
         "responses": {
           "200": {
@@ -66,13 +94,9 @@
             },
             "examples": { 
               "application/json": {
-                "value": [
-                  {  
-                    "nameAvailable": false,
-                    "reason": "AlreadyExists",
-                    "message": "Already in use by another Media Service instance. Please try again with a name that is not likely to be in use."
-                  }  
-                ]
+                "nameAvailable": false,
+                "reason": "AlreadyExists",
+                "message": "Already in use by another Media Service instance. Please try again with a name that is not likely to be in use."
               }  
             }
           },
@@ -92,6 +116,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceListByResourceGroup": { "$ref": "./examples/MediaServiceListByResourceGroup.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -114,7 +141,7 @@
                 "value": [
                   {
                     "name": "contosomedia",
-                    "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Media/mediaservices/contosomedia",
+                    "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia",
                     "type": "Microsoft.Media/mediaservices",
                     "location": "West US",
                     "properties":{  
@@ -126,7 +153,7 @@
                       ],
                       "storageAccounts":[  
                         {  
-                          "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia",
+                          "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia",
                           "isPrimary": true
                         }
                       ]
@@ -155,6 +182,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceGet": { "$ref": "./examples/MediaServiceGet.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -178,7 +208,7 @@
             "examples" : {
               "application/json": {
                 "name": "contosomedia",
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Media/mediaservices/contosomedia",
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia",
                 "type": "Microsoft.Media/mediaservices",
                 "location": "West US",
                 "properties":{  
@@ -190,7 +220,7 @@
                   ],
                   "storageAccounts":[  
                     {  
-                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia",
+                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia",
                       "isPrimary": true
                     }
                   ]
@@ -207,11 +237,14 @@
         }
       },
       "put": {
-        "description": "Creates a Media Service.",
         "operationId": "MediaService_Create",
+        "description": "Creates a Media Service.",
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceCreate": { "$ref": "./examples/MediaServiceCreate.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -226,7 +259,7 @@
             "$ref": "#/parameters/mediaResourceNameParameter"
           },
           {
-            "name": "MediaService",
+            "name": "parameters",
             "description": "Media Service properties needed for creation.",
             "in": "body",
             "required": true,
@@ -244,7 +277,7 @@
             "examples" : {
               "application/json": {
                 "name": "contosomedia",
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Media/mediaservices/contosomedia",
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia",
                 "type": "Microsoft.Media/mediaservices",
                 "location": "West US",
                 "properties":{  
@@ -256,7 +289,7 @@
                   ],
                   "storageAccounts":[  
                     {  
-                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia",
+                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia",
                       "isPrimary": true
                     }
                   ]
@@ -278,6 +311,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceDelete": { "$ref": "./examples/MediaServiceDelete.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -313,6 +349,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceUpdate": { "$ref": "./examples/MediaServiceUpdate.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -327,7 +366,7 @@
             "$ref": "#/parameters/mediaResourceNameParameter"
           },
           {
-            "name": "MediaService",
+            "name": "parameters",
             "description": "Media Service properties needed for update.",
             "in": "body",
             "required": true,
@@ -345,7 +384,7 @@
             "examples" : {
               "application/json": {
                 "name": "contosomedia",
-                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Media/mediaservices/contosomedia",
+                "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia",
                 "type": "Microsoft.Media/mediaservices",
                 "location": "West US",
                 "properties":{  
@@ -357,7 +396,7 @@
                   ],
                   "storageAccounts":[  
                     {  
-                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia",
+                      "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia",
                       "isPrimary": true
                     }
                   ]
@@ -381,6 +420,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceRegenerateKey": { "$ref": "./examples/MediaServiceRegenerateKey.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -395,7 +437,7 @@
             "$ref": "#/parameters/mediaResourceNameParameter"
           },
           {
-            "name": "RegenerateKeyInput",
+            "name": "parameters",
             "description": "Properties needed to regenerate the Media Service key.",
             "in": "body",
             "required": true,
@@ -432,6 +474,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceListKeys": { "$ref": "./examples/MediaServiceListKeys.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -478,6 +523,9 @@
         "externalDocs": {
           "url": "https://aka.ms/media-manage"
         },
+        "x-ms-examples": {
+          "MediaServiceSyncStorageKeys": { "$ref": "./examples/MediaServiceSyncStorageKeys.json" }
+        },
         "parameters": [
           {
             "$ref": "#/parameters/subscriptionIdParameter"
@@ -492,7 +540,7 @@
             "$ref": "#/parameters/mediaResourceNameParameter"
           },
           {
-            "name": "SyncStorageKeysInput",
+            "name": "parameters",
             "description": "Properties needed to synchronize the keys for a storage account to the Media Service.",
             "in": "body",
             "required": true,
@@ -566,7 +614,7 @@
         "name": {
           "description": "The name of the resource. A name must be globally unique.",
           "type": "string",
-          "pattern": "^[a-z0-9]",
+          "pattern": "^[a-z0-9]{3,24}$",
           "minLength": 3,
           "maxLength": 24
         },
@@ -589,29 +637,12 @@
     },    
     "CheckNameAvailabilityOutput": {
       "description": "The response body for CheckNameAvailability API.",
-       "example": { 
-         "value": [
-           {
-             "NameAvailable": true
-           }, 
-           {  
-             "NameAvailable": false,
-             "Reason": "AlreadyExists",
-             "Message": "Already in use by another Media Service instance. Please try again with a name that is not likely to be in use."
-           },
-           {
-             "NameAvailable": false,
-             "Reason": "Invalid",
-             "Message": "The media service name should be between 3 and 24 characters and may contain only lowercase letters and numbers."
-           }  
-         ]
-      },  
       "properties": {
-        "NameAvailable": {
+        "nameAvailable": {
           "description": "Specifies if the name is available.",
           "type": "boolean"
         },
-        "Reason": {
+        "reason": {
           "description": "Specifies the reason if the name is not available.",
           "type": "string",
           "enum": [
@@ -624,7 +655,7 @@
             "modelAsString": false
           }  
         },
-        "Message": {
+        "message": {
           "description": "Specifies the detailed reason if the name is not available.",
           "type": "string"
         }
@@ -637,14 +668,15 @@
         "properties": {
           "storageAccounts": [
             {
-              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia",
-            "isPrimary": true
+              "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia",
+              "isPrimary": true
             }
           ]
         }
       },
       "properties": {
         "properties": {
+          "description": "The additional properties of a Media Service resource.",
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/MediaServiceProperties"
         }
@@ -659,6 +691,7 @@
       "description": "The collection of Media Service resources.",
       "properties": {
         "value": {
+          "description": "The collection of Media Service resources.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/MediaService"
@@ -788,7 +821,7 @@
     "StorageAccount": {
       "description": "The properties of a storage account associated with this resource.",
        "example": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia",
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia",
         "isPrimary": true
       },
       "required": [
@@ -809,7 +842,7 @@
     "SyncStorageKeysInput": {
       "description": "The request  body for a SyncStorageKeys API.",
       "example": {
-        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso-media/providers/Microsoft.Storage/storageAccounts/contosomedia"
+        "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Storage/storageAccounts/contosomedia"
       },
       "required": [
         "id"
@@ -820,6 +853,55 @@
           "type": "string"
         }
       }
+    },
+    "OperationListResult": {
+      "description": "Result of the request to list Media Services operations.",
+      "properties": {
+        "value": {
+          "description": "List of Media Services operations supported by the Microsoft.Media resource provider.",
+          "type": "array",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/Operation"
+          }
+        },
+        "nextLink": {
+          "description": "URL to get the next set of operation list results if there are any.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "Operation": {
+      "description": "A Media Services REST API operation",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Operation name: {provider}/{resource}/{operation}",
+          "type": "string",
+          "readOnly": true
+        },
+        "display": {
+          "description": "The object that represents the operation.",
+          "properties": {
+            "provider": {
+              "description": "Service provider: Microsoft.Media",
+              "type": "string",
+              "readOnly": true
+            },
+            "resource": {
+              "description": "Resource on which the operation is performed: Invoice, etc.",
+              "type": "string",
+              "readOnly": true
+            },
+            "operation": {
+              "description": "Operation type: Read, write, delete, etc.",
+              "type": "string",
+              "readOnly": true
+            }
+          }
+        }
+      }
     }
   },
   "parameters": {
@@ -844,14 +926,14 @@
       "in": "path",
       "required": true,
       "type": "string",
-      "pattern": "^[a-z0-9]",
+      "pattern": "^[a-z0-9]{3,24}$",
       "minLength": 3,
       "maxLength": 24,
       "x-ms-parameter-location": "method"
     },
     "apiVersionParameter": {
       "name": "api-version",
-      "description": "Version of the API to be used with the client request. Current version is 2015-10-01",
+      "description": "Version of the API to be used with the client request. The current version is 2015-10-01.",
       "in": "query",
       "required": true,
       "type": "string"