diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json
index 0b1993e81f4b..f2f5df00c10c 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/networkWatcher.json
@@ -895,12 +895,11 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog": {
       "post": {
         "tags": [
-          "NetworkWatchers",
-          "TrafficAnalytics"
+          "NetworkWatchers"
         ],
         "operationId": "NetworkWatchers_SetFlowLogConfiguration",
         "x-ms-long-running-operation": true,
-        "description": "Configures flow log  and traffic analytics (optional) on a specified resource.",
+        "description": "Configures flow log on a specified resource.",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -934,7 +933,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Successful request for setting flow log  and traffic analytics (optional) configuration.",
+            "description": "Successful request for setting flow log configuration.",
             "schema": {
               "$ref": "#/definitions/FlowLogInformation"
             }
@@ -951,12 +950,11 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus": {
       "post": {
         "tags": [
-          "NetworkWatchers",
-          "TrafficAnalytics"
+          "NetworkWatchers"
         ],
         "operationId": "NetworkWatchers_GetFlowLogStatus",
         "x-ms-long-running-operation": true,
-        "description": "Queries status of flow log  and traffic analytics (optional) on a specified resource.",
+        "description": "Queries status of flow log on a specified resource.",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -979,7 +977,7 @@
             "schema": {
               "$ref": "#/definitions/FlowLogStatusParameters"
             },
-            "description": "Parameters that define a resource to query flow log and traffic analytics (optional)  status."
+            "description": "Parameters that define a resource to query flow log status."
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -990,7 +988,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Successful request for query flow log and traffic analytics (optional) status.",
+            "description": "Successful request for query flow log status.",
             "schema": {
               "$ref": "#/definitions/FlowLogInformation"
             }
@@ -2254,13 +2252,13 @@
       }
     },
     "FlowLogStatusParameters": {
-      "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status.",
+      "description": "Parameters that define a resource to query flow log status.",
       "required": [
         "targetResourceId"
       ],
       "properties": {
         "targetResourceId": {
-          "description": "The target resource where getting the flow log and and traffic analytics (optional) status.",
+          "description": "The target resource where getting the flow logging status.",
           "type": "string"
         }
       }
@@ -2281,7 +2279,7 @@
       }
     },
     "FlowLogInformation": {
-      "description": "Information on the configuration of flow log and traffic analytics (optional) .",
+      "description": "Information on the configuration of flow log.",
       "required": [
         "targetResourceId",
         "properties"
@@ -2294,47 +2292,6 @@
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/FlowLogProperties"
-        },
-        "flowAnalyticsConfiguration": {
-          "$ref": "#/definitions/TrafficAnalyticsProperties"
-         }
-      }
-    },
-    "TrafficAnalyticsProperties": {
-      "description": "Parameters that define the configuration of traffic analytics.",
-      "required": [
-        "networkWatcherFlowAnalyticsConfiguration"
-      ],
-      "properties": {
-        "networkWatcherFlowAnalyticsConfiguration": {
-          "$ref": "#/definitions/TrafficAnalyticsConfigurationProperties"
-        }
-      }
-    },
-    "TrafficAnalyticsConfigurationProperties": {
-      "description": "Parameters that define the configuration of traffic analytics.",
-      "required": [
-        "enabled",
-        "workspaceId",
-        "workspaceRegion",
-        "workspaceResourceId"
-      ],
-      "properties": {
-        "enabled": {
-          "description": "Flag to enable/disable traffic analytics.",
-          "type": "boolean"
-        },
-        "workspaceId": {
-          "description": "The resource guid of the attached workspace",
-          "type": "string"
-        },
-        "workspaceRegion": {
-          "description": "The location of the attached workspace",
-          "type": "string"
-        },
-        "workspaceResourceId": {
-          "description": "Resource Id of the attached workspace ",
-         "type": "string"
         }
       }
     },
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json
index e2e2fddf2f58..b84a54236cb1 100644
--- a/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json
+++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-05-01/networkWatcher.json
@@ -943,11 +943,12 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/configureFlowLog": {
       "post": {
         "tags": [
-          "NetworkWatchers"
+          "NetworkWatchers",
+          "TrafficAnalytics"
         ],
         "operationId": "NetworkWatchers_SetFlowLogConfiguration",
         "x-ms-long-running-operation": true,
-        "description": "Configures flow log on a specified resource.",
+        "description": "Configures flow log  and traffic analytics (optional) on a specified resource.",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -981,7 +982,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Successful request for setting flow log configuration.",
+            "description": "Successful request for setting flow log  and traffic analytics (optional) configuration.",
             "schema": {
               "$ref": "#/definitions/FlowLogInformation"
             }
@@ -1001,11 +1002,12 @@
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/queryFlowLogStatus": {
       "post": {
         "tags": [
-          "NetworkWatchers"
+          "NetworkWatchers",
+          "TrafficAnalytics"
         ],
         "operationId": "NetworkWatchers_GetFlowLogStatus",
         "x-ms-long-running-operation": true,
-        "description": "Queries status of flow log on a specified resource.",
+        "description": "Queries status of flow log and traffic analytics (optional) on a specified resource.",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -1028,7 +1030,7 @@
             "schema": {
               "$ref": "#/definitions/FlowLogStatusParameters"
             },
-            "description": "Parameters that define a resource to query flow log status."
+            "description": "Parameters that define a resource to query flow log and traffic analytics (optional)  status."
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -1039,7 +1041,7 @@
         ],
         "responses": {
           "200": {
-            "description": "Successful request for query flow log status.",
+            "description": "Successful request for query flow log and traffic analytics (optional) status.",
             "schema": {
               "$ref": "#/definitions/FlowLogInformation"
             }
@@ -2330,13 +2332,13 @@
       }
     },
     "FlowLogStatusParameters": {
-      "description": "Parameters that define a resource to query flow log status.",
+      "description": "Parameters that define a resource to query flow log and traffic analytics (optional) status.",
       "required": [
         "targetResourceId"
       ],
       "properties": {
         "targetResourceId": {
-          "description": "The target resource where getting the flow logging status.",
+          "description": "The target resource where getting the flow log and traffic analytics (optional) status.",
           "type": "string"
         }
       }
@@ -2357,19 +2359,60 @@
       }
     },
     "FlowLogInformation": {
-      "description": "Information on the configuration of flow log.",
+      "description": "Information on the configuration of flow log and traffic analytics (optional) .",
       "required": [
         "targetResourceId",
         "properties"
       ],
       "properties": {
         "targetResourceId": {
-          "description": "The ID of the resource to configure for flow logging.",
+          "description": "The ID of the resource to configure for flow log and traffic analytics (optional) .",
           "type": "string"
         },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/FlowLogProperties"
+        },
+        "flowAnalyticsConfiguration": {
+          "$ref": "#/definitions/TrafficAnalyticsProperties"
+        }
+      }
+    },
+     "TrafficAnalyticsProperties": {
+      "description": "Parameters that define the configuration of traffic analytics.",
+      "required": [
+        "networkWatcherFlowAnalyticsConfiguration"
+      ],
+      "properties": {
+        "networkWatcherFlowAnalyticsConfiguration": {
+          "$ref": "#/definitions/TrafficAnalyticsConfigurationProperties"
+        }
+      }
+    },
+    "TrafficAnalyticsConfigurationProperties": {
+      "description": "Parameters that define the configuration of traffic analytics.",
+      "required": [
+        "enabled",
+        "workspaceId",
+        "workspaceRegion",
+        "workspaceResourceId"
+      ],
+      "properties": {
+        "enabled": {
+          "description": "Flag to enable/disable traffic analytics.",
+          "type": "boolean"
+        },
+        "workspaceId": {
+          "description": "The resource guid of the attached workspace",
+          "type": "string"
+        },
+        "workspaceRegion": {
+          "description": "The location of the attached workspace",
+          "type": "string"
+        },
+        "workspaceResourceId": {
+          "description": "Resource Id of the attached workspace ",
+         "type": "string"
         }
       }
     },