diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.go.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.go.md
similarity index 95%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/readme.go.md
rename to specification/cognitiveservices/data-plane/AnomalyDetector/readme.go.md
index 1c6667023fd1..2ebcd31376f7 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.go.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.go.md
@@ -5,7 +5,7 @@ These settings apply only when `--go` is specified on the command line.
 ``` yaml $(go)
 go:
   license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: anomalyfinder
+  namespace: anomalydetector
   clear-output-folder: true
 ```
 
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.md
similarity index 81%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/readme.md
rename to specification/cognitiveservices/data-plane/AnomalyDetector/readme.md
index 6a860537fb1d..81c6f79183c0 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.md
@@ -1,8 +1,8 @@
-# Cognitive Services Anomaly Finder SDK
+# Cognitive Services Anomaly Detector SDK
 
 > see https://aka.ms/autorest
 
-Configuration for generating Anomaly Finder SDK.
+Configuration for generating Anomaly Detector SDK.
 
 The current release is `release_2_0`.
 
@@ -19,7 +19,7 @@ openapi-type: data-plane
 These settings apply only when `--tag=release_2_0` is specified on the command line.
 
 ``` yaml $(tag) == 'release_2_0'
-input-file: stable/v2.0/AnomalyFinder.json
+input-file: stable/v2.0/AnomalyDetector.json
 ```
 
 ## Swagger to SDK
@@ -36,7 +36,7 @@ swagger-to-sdk:
   - repo: azure-sdk-for-node
   - repo: azure-sdk-for-ruby
     after_scripts:
-      - bundle install && rake arm:regen_all_profiles['azure_cognitiveservices_anomalyfinder']
+      - bundle install && rake arm:regen_all_profiles['azure_cognitiveservices_anomalydetector']
 ```
 
 ## CSharp Settings
@@ -48,8 +48,8 @@ csharp:
   sync-methods: None
   license-header: MICROSOFT_MIT_NO_VERSION
   azure-arm: false
-  namespace: Microsoft.Azure.CognitiveServices.AnomalyFinder
-  output-folder: $(csharp-sdks-folder)/CognitiveServices/dataPlane/AnomalyFinder/AnomalyFinder/Generated
+  namespace: Microsoft.Azure.CognitiveServices.AnomalyDetector
+  output-folder: $(csharp-sdks-folder)/CognitiveServices/dataPlane/AnomalyDetector/AnomalyDetector/Generated
   clear-output-folder: true
 ```
 
@@ -69,10 +69,10 @@ Please also specify `--azure-libraries-for-java-folder=<path to the root directo
 ``` yaml $(java)
 java:
   azure-arm: true
-  namespace: com.microsoft.azure.cognitiveservices.anomalyfinder
+  namespace: com.microsoft.azure.cognitiveservices.anomalydetector
   license-header: MICROSOFT_MIT_NO_CODEGEN
   payload-flattening-threshold: 1
-  output-folder: $(azure-libraries-for-java-folder)/cognitiveservices/data-plane/anomalyfinder
+  output-folder: $(azure-libraries-for-java-folder)/cognitiveservices/data-plane/anomalydetector
   with-optional-parameters: true
   with-single-async-method: true
 ```
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.nodejs.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.nodejs.md
similarity index 83%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/readme.nodejs.md
rename to specification/cognitiveservices/data-plane/AnomalyDetector/readme.nodejs.md
index c42f25de3ce7..57487da2a84f 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.nodejs.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.nodejs.md
@@ -5,8 +5,8 @@ Please also specify `--node-sdks-folder=<path to root folder of your azure-sdk-f
 
 ``` yaml $(nodejs)
 nodejs:
-  package-name: azure-cognitiveservices-anomalyfinder
-  output-folder: $(node-sdks-folder)/lib/services/cognitiveServicesAnomalyFinder
+  package-name: azure-cognitiveservices-anomalydetector
+  output-folder: $(node-sdks-folder)/lib/services/cognitiveServicesAnomalyDetector
   azure-arm: false
   generate-license-txt: true
   generate-package-json: true
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.python.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.python.md
similarity index 81%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/readme.python.md
rename to specification/cognitiveservices/data-plane/AnomalyDetector/readme.python.md
index b9cc574371cf..3de1d0062eab 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.python.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.python.md
@@ -10,17 +10,17 @@ python:
   license-header: MICROSOFT_MIT_NO_VERSION
   add-credentials: true
   payload-flattening-threshold: 2
-  namespace: azure.cognitiveservices.anomalyfinder
-  package-name: azure-cognitiveservices-anomalyfinder
+  namespace: azure.cognitiveservices.anomalydetector
+  package-name: azure-cognitiveservices-anomalydetector
   clear-output-folder: true
 ```
 ``` yaml $(python) && $(python-mode) == 'update'
 python:
   no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/azure-cognitiveservices-anomalyfinder/azure/cognitiveservices/anomalyfinder
+  output-folder: $(python-sdks-folder)/azure-cognitiveservices-anomalydetector/azure/cognitiveservices/anomalydetector
 ```
 ``` yaml $(python) && $(python-mode) == 'create'
 python:
   basic-setup-py: true
-  output-folder: $(python-sdks-folder)/azure-cognitiveservices-anomalyfinder
+  output-folder: $(python-sdks-folder)/azure-cognitiveservices-anomalydetector
 ```
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.ruby.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.ruby.md
similarity index 77%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/readme.ruby.md
rename to specification/cognitiveservices/data-plane/AnomalyDetector/readme.ruby.md
index 6e0beb180fb3..b9f5c4c49b92 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.ruby.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.ruby.md
@@ -3,7 +3,7 @@
 These settings apply only when `--ruby` is specified on the command line.
 
 ``` yaml
-package-name: azure_cognitiveservices_anomalyfinder
+package-name: azure_cognitiveservices_anomalydetector
 package-version: "0.16.0"
 azure-arm: true
 ```
@@ -21,7 +21,7 @@ These settings apply only when `--tag=release_2_0 --ruby` is specified on the co
 Please also specify `--ruby-sdks-folder=<path to the root directory of your azure-sdk-for-ruby clone>`.
 
 ``` yaml $(tag) == 'release_2_0' && $(ruby)
-namespace: "Azure::CognitiveServices::AnomalyFinder::V2_0"
-output-folder: $(ruby-sdks-folder)/data/azure_cognitiveservices_anomalyfinder/lib
-title: "AnomalyFinderClient"
+namespace: "Azure::CognitiveServices::AnomalyDetector::V2_0"
+output-folder: $(ruby-sdks-folder)/data/azure_cognitiveservices_anomalydetector/lib
+title: "AnomalyDetectorClient"
 ```
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.typescript.md b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md
similarity index 79%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/readme.typescript.md
rename to specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md
index 339223231a18..4233005354a8 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/readme.typescript.md
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/readme.typescript.md
@@ -5,8 +5,8 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 
 ``` yaml $(typescript)
 typescript:
-  package-name: "@azure/cognitiveservices-anomalyfinder"
-  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-anomalyfinder"
+  package-name: "@azure/cognitiveservices-anomalydetector"
+  output-folder: "$(typescript-sdks-folder)/packages/@azure/cognitiveservices-anomalydetector"
   azure-arm: false
   generate-metadata: true
 ```
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/AnomalyFinder.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/AnomalyDetector.json
similarity index 88%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/AnomalyFinder.json
rename to specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/AnomalyDetector.json
index 66128cd74078..96d89f3ad312 100644
--- a/specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/AnomalyFinder.json
+++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/AnomalyDetector.json
@@ -2,8 +2,8 @@
   "swagger": "2.0",
   "info": {
     "version": "2.0",
-    "title": "Anomaly Finder Client",
-    "description": "The Anomaly Finder API detects anomalies automatically in time series data. It supports two functionalities, one is for detecting the whole series with model trained by the timeseries, another is detecting last point with model trained by points before. By using this service, business customers can discover incidents and establish a logic flow for root cause analysis."
+    "title": "Anomaly Detector Client",
+    "description": "The Anomaly Detector API detects anomalies automatically in time series data. It supports two functionalities, one is for detecting the whole series with model trained by the timeseries, another is detecting last point with model trained by points before. By using this service, business customers can discover incidents and establish a logic flow for root cause analysis."
   },
   "securityDefinitions": {
     "apiKeyHeader": {
@@ -18,7 +18,7 @@
     }
   ],
   "x-ms-parameterized-host": {
-    "hostTemplate": "{Endpoint}/anomalyfinder/v2.0",
+    "hostTemplate": "{Endpoint}/anomalydetector/v2.0",
     "useSchemePrefix": false,
     "parameters": [
       {
@@ -130,7 +130,7 @@
             "InvalidSeries"
           ],
           "x-ms-enum": {
-            "name": "AnomalyFinderErrorCodes",
+            "name": "AnomalyDetectorErrorCodes",
             "modelAsString": true
           }
         },
@@ -151,7 +151,8 @@
           "type": "array",
           "description": "Time series data points. Points should be sorted by timestamp in ascending order to match the anomaly detection result. If the data is not sorted correctly or there is duplicated timestamp, the API will not work. In such case, an error message will be returned.",
           "items": {
-            "$ref": "#/definitions/Point"
+            "$ref": "#/definitions/Point",
+            "x-nullable": false
           }
         },
         "granularity": {
@@ -233,50 +234,66 @@
           "description": "ExpectedValues contain expected value for each input point. The index of the array is consistent with the input series.",
           "items": {
             "type": "number",
-            "format": "float"
+            "format": "float",
+            "x-nullable": false
           }
         },
         "upperMargins": {
           "type": "array",
-          "description": "UpperMargins contain upper margin of each input point. UpperMargin is used to calculate upperBoundary, which equals to expectedValue + (100 - sensitivity)*upperMargin. Anomalies in response can be filtered by upperBoundary and lowerBoundary. By adjusting sensitivity value, less significant anomalies can be filtered in client side. The index of the array is consistent with the input series.",
+          "description": "UpperMargins contain upper margin of each input point. UpperMargin is used to calculate upperBoundary, which equals to expectedValue + (100 - marginScale)*upperMargin. Anomalies in response can be filtered by upperBoundary and lowerBoundary. By adjusting marginScale value, less significant anomalies can be filtered in client side. The index of the array is consistent with the input series.",
           "items": {
             "type": "number",
-            "format": "float"
+            "format": "float",
+            "x-nullable": false
           }
         },
         "lowerMargins": {
           "type": "array",
-          "description": "LowerMargins contain lower margin of each input point. LowerMargin is used to calculate lowerBoundary, which equals to expectedValue - (100 - sensitivity)*lowerMargin. Points between the boundary can be marked as normal ones in client side. The index of the array is consistent with the input series.",
+          "description": "LowerMargins contain lower margin of each input point. LowerMargin is used to calculate lowerBoundary, which equals to expectedValue - (100 - marginScale)*lowerMargin. Points between the boundary can be marked as normal ones in client side. The index of the array is consistent with the input series.",
           "items": {
             "type": "number",
-            "format": "float"
+            "format": "float",
+            "x-nullable": false
           }
         },
         "isAnomaly": {
           "type": "array",
           "description": "IsAnomaly contains anomaly properties for each input point. True means an anomaly either negative or positive has been detected. The index of the array is consistent with the input series.",
           "items": {
-            "type": "boolean"
+            "type": "boolean",
+            "x-nullable": false
           }
         },
         "isNegativeAnomaly": {
           "type": "array",
           "description": "IsNegativeAnomaly contains anomaly status in negative direction for each input point. True means a negative anomaly has been detected. A negative anomaly means the point is detected as an anomaly and its real value is smaller than the expected one. The index of the array is consistent with the input series.",
           "items": {
-            "type": "boolean"
+            "type": "boolean",
+            "x-nullable": false
           }
         },
         "isPositiveAnomaly": {
           "type": "array",
           "description": "IsPositiveAnomaly contain anomaly status in positive direction for each input point. True means a positive anomaly has been detected. A positive anomaly means the point is detected as an anomaly and its real value is larger than the expected one. The index of the array is consistent with the input series.",
           "items": {
-            "type": "boolean"
+            "type": "boolean",
+            "x-nullable": false
           }
         }
       }
     },
     "LastDetectResponse": {
       "type": "object",
+      "required": [
+        "expectedValue",
+        "isAnomaly",
+        "isNegativeAnomaly",
+        "isPositiveAnomaly",
+        "lowerMargin",
+        "period",
+        "upperMargin",
+        "suggestedWindow"
+      ],
       "properties": {
         "period": {
           "type": "integer",
@@ -296,12 +313,12 @@
         "upperMargin": {
           "type": "number",
           "format": "float",
-          "description": "Upper margin of the latest point. UpperMargin is used to calculate upperBoundary, which equals to expectedValue + (100 - sensitivity)*upperMargin. If the value of latest point is between upperBoundary and lowerBoundary, it should be treated as normal value. By adjusting sensitivity value, anomaly status of latest point can be changed."
+          "description": "Upper margin of the latest point. UpperMargin is used to calculate upperBoundary, which equals to expectedValue + (100 - marginScale)*upperMargin. If the value of latest point is between upperBoundary and lowerBoundary, it should be treated as normal value. By adjusting marginScale value, anomaly status of latest point can be changed."
         },
         "lowerMargin": {
           "type": "number",
           "format": "float",
-          "description": "Lower margin of the latest point. LowerMargin is used to calculate lowerBoundary, which equals to expectedValue - (100 - sensitivity)*lowerMargin. "
+          "description": "Lower margin of the latest point. LowerMargin is used to calculate lowerBoundary, which equals to expectedValue - (100 - marginScale)*lowerMargin. "
         },
         "isAnomaly": {
           "type": "boolean",
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/examples/EntireDetect.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/examples/EntireDetect.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/examples/EntireDetect.json
rename to specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/examples/EntireDetect.json
diff --git a/specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/examples/LastDetect.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/examples/LastDetect.json
similarity index 100%
rename from specification/cognitiveservices/data-plane/AnomalyFinder/stable/v2.0/examples/LastDetect.json
rename to specification/cognitiveservices/data-plane/AnomalyDetector/stable/v2.0/examples/LastDetect.json