diff --git a/custom-words.txt b/custom-words.txt
index fecaa9a0cec5..0f59de80a98f 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -1118,6 +1118,7 @@ qnormal
 querylogs
 querypool
 querystring
+querytriggers
 Queretaro
 queueservices
 quickbooks
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
index dc93bc487aea..fb83c4a4c7da 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
@@ -2605,6 +2605,57 @@
         }
       }
     },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/querytriggers": {
+      "post": {
+        "tags": [
+          "triggers"
+        ],
+        "operationId": "Triggers_QueryByFactory",
+        "x-ms-examples": {
+          "Triggers_QueryByFactory": {
+            "$ref": "./examples/Triggers_QueryByFactory.json"
+          }
+        },
+        "description": "Query triggers.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionId"
+          },
+          {
+            "$ref": "#/parameters/resourceGroupName"
+          },
+          {
+            "$ref": "#/parameters/factoryName"
+          },
+          {
+            "$ref": "#/parameters/api-version"
+          },
+          {
+            "name": "filterParameters",
+            "description": "Parameters to filter the triggers.",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/TriggerFilterParameters"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK.",
+            "schema": {
+              "$ref": "#/definitions/TriggerQueryResponse"
+            }
+          },
+          "default": {
+            "description": "An error response received from the Azure Data Factory service.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}": {
       "put": {
         "tags": [
@@ -3039,249 +3090,6 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}": {
-      "put": {
-        "tags": [
-          "rerunTriggers"
-        ],
-        "operationId": "RerunTriggers_Create",
-        "x-ms-examples": {
-          "RerunTriggers_Create": {
-            "$ref": "./examples/RerunTriggers_Create.json"
-          }
-        },
-        "description": "Creates a rerun trigger.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/subscriptionId"
-          },
-          {
-            "$ref": "#/parameters/resourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/factoryName"
-          },
-          {
-            "$ref": "#/parameters/triggerName"
-          },
-          {
-            "$ref": "#/parameters/rerunTriggerName"
-          },
-          {
-            "$ref": "#/parameters/api-version"
-          },
-          {
-            "name": "rerunTumblingWindowTriggerActionParameters",
-            "description": "Rerun tumbling window trigger action parameters.",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/RerunTumblingWindowTriggerActionParameters"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK.",
-            "schema": {
-              "$ref": "#/definitions/TriggerResource"
-            }
-          },
-          "default": {
-            "description": "An error response received from the Azure Data Factory service.",
-            "schema": {
-              "$ref": "#/definitions/CloudError"
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}/start": {
-      "post": {
-        "tags": [
-          "rerunTriggers"
-        ],
-        "operationId": "RerunTriggers_Start",
-        "x-ms-examples": {
-          "RerunTriggers_Start": {
-            "$ref": "./examples/RerunTriggers_Start.json"
-          }
-        },
-        "description": "Starts a trigger.",
-        "x-ms-long-running-operation": true,
-        "parameters": [
-          {
-            "$ref": "#/parameters/subscriptionId"
-          },
-          {
-            "$ref": "#/parameters/resourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/factoryName"
-          },
-          {
-            "$ref": "#/parameters/triggerName"
-          },
-          {
-            "$ref": "#/parameters/rerunTriggerName"
-          },
-          {
-            "$ref": "#/parameters/api-version"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Trigger has been started successfully."
-          },
-          "default": {
-            "description": "An error response received from the Azure Data Factory service.",
-            "schema": {
-              "$ref": "#/definitions/CloudError"
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}/stop": {
-      "post": {
-        "tags": [
-          "rerunTriggers"
-        ],
-        "operationId": "RerunTriggers_Stop",
-        "x-ms-examples": {
-          "RerunTriggers_Stop": {
-            "$ref": "./examples/RerunTriggers_Stop.json"
-          }
-        },
-        "description": "Stops a trigger.",
-        "x-ms-long-running-operation": true,
-        "parameters": [
-          {
-            "$ref": "#/parameters/subscriptionId"
-          },
-          {
-            "$ref": "#/parameters/resourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/factoryName"
-          },
-          {
-            "$ref": "#/parameters/triggerName"
-          },
-          {
-            "$ref": "#/parameters/rerunTriggerName"
-          },
-          {
-            "$ref": "#/parameters/api-version"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Trigger has been stopped successfully."
-          },
-          "default": {
-            "description": "An error response received from the Azure Data Factory service.",
-            "schema": {
-              "$ref": "#/definitions/CloudError"
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/rerunTriggers/{rerunTriggerName}/cancel": {
-      "post": {
-        "tags": [
-          "rerunTriggers"
-        ],
-        "operationId": "RerunTriggers_Cancel",
-        "x-ms-examples": {
-          "RerunTriggers_Cancel": {
-            "$ref": "./examples/RerunTriggers_Cancel.json"
-          }
-        },
-        "description": "Cancels a trigger.",
-        "x-ms-long-running-operation": true,
-        "parameters": [
-          {
-            "$ref": "#/parameters/subscriptionId"
-          },
-          {
-            "$ref": "#/parameters/resourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/factoryName"
-          },
-          {
-            "$ref": "#/parameters/triggerName"
-          },
-          {
-            "$ref": "#/parameters/rerunTriggerName"
-          },
-          {
-            "$ref": "#/parameters/api-version"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Trigger has been canceled successfully."
-          },
-          "default": {
-            "description": "An error response received from the Azure Data Factory service.",
-            "schema": {
-              "$ref": "#/definitions/CloudError"
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/rerunTriggers": {
-      "get": {
-        "tags": [
-          "rerunTriggers"
-        ],
-        "operationId": "RerunTriggers_ListByTrigger",
-        "x-ms-examples": {
-          "RerunTriggers_ListByTrigger": {
-            "$ref": "./examples/RerunTriggers_ListByTrigger.json"
-          }
-        },
-        "description": "Lists rerun triggers by an original trigger name.",
-        "parameters": [
-          {
-            "$ref": "#/parameters/subscriptionId"
-          },
-          {
-            "$ref": "#/parameters/resourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/factoryName"
-          },
-          {
-            "$ref": "#/parameters/triggerName"
-          },
-          {
-            "$ref": "#/parameters/api-version"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK.",
-            "schema": {
-              "$ref": "#/definitions/RerunTriggerListResponse"
-            }
-          },
-          "default": {
-            "description": "An error response received from the Azure Data Factory service.",
-            "schema": {
-              "$ref": "#/definitions/CloudError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        }
-      }
-    },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/queryTriggerRuns": {
       "post": {
         "tags": [
@@ -4217,6 +4025,26 @@
         }
       }
     },
+    "TriggerQueryResponse": {
+      "description": "A query of triggers.",
+      "type": "object",
+      "required": [
+        "value"
+      ],
+      "properties": {
+        "value": {
+          "type": "array",
+          "description": "List of triggers.",
+          "items": {
+            "$ref": "#/definitions/TriggerResource"
+          }
+        },
+        "continuationToken": {
+          "description": "The continuation token for getting the next page of results, if any remaining results exist, null otherwise.",
+          "type": "string"
+        }
+      }
+    },
     "TriggerListResponse": {
       "description": "A list of trigger resources.",
       "type": "object",
@@ -4848,6 +4676,20 @@
         "properties"
       ]
     },
+    "TriggerFilterParameters": {
+      "description": "Query parameters for triggers.",
+      "type": "object",
+      "properties": {
+        "continuationToken": {
+          "description": "The continuation token for getting the next page of results. Null for first page.",
+          "type": "string"
+        },
+        "parentTriggerName": {
+          "description": "The name of the parent TumblingWindowTrigger to get the child rerun triggers",
+          "type": "string"
+        }
+      }
+    },
     "RunFilterParameters": {
       "description": "Query parameters for listing runs.",
       "type": "object",
@@ -5302,71 +5144,6 @@
         "type": "object"
       }
     },
-    "RerunTumblingWindowTriggerActionParameters": {
-      "description": "Rerun tumbling window trigger Parameters.",
-      "type": "object",
-      "properties": {
-        "startTime": {
-          "description": "The start time for the time period for which restatement is initiated. Only UTC time is currently supported.",
-          "type": "string",
-          "format": "date-time"
-        },
-        "endTime": {
-          "description": "The end time for the time period for which restatement is initiated. Only UTC time is currently supported.",
-          "type": "string",
-          "format": "date-time"
-        },
-        "maxConcurrency": {
-          "description": "The max number of parallel time windows (ready for execution) for which a rerun is triggered.",
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 50
-        }
-      },
-      "required": [
-        "startTime",
-        "endTime",
-        "maxConcurrency"
-      ]
-    },
-    "RerunTriggerListResponse": {
-      "description": "A list of rerun triggers.",
-      "type": "object",
-      "required": [
-        "value"
-      ],
-      "properties": {
-        "value": {
-          "type": "array",
-          "description": "List of rerun triggers.",
-          "items": {
-            "$ref": "#/definitions/RerunTriggerResource"
-          }
-        },
-        "nextLink": {
-          "description": "The continuation token for getting the next page of results, if any remaining results exist, null otherwise.",
-          "type": "string",
-          "readOnly": true
-        }
-      }
-    },
-    "RerunTriggerResource": {
-      "description": "RerunTrigger resource type.",
-      "allOf": [
-        {
-          "$ref": "#/definitions/SubResource"
-        }
-      ],
-      "properties": {
-        "properties": {
-          "$ref": "./entityTypes/Trigger.json#/definitions/RerunTumblingWindowTrigger",
-          "description": "Properties of the rerun trigger."
-        }
-      },
-      "required": [
-        "properties"
-      ]
-    },
     "OperationListResponse": {
       "description": "A list of operations that can be performed by the Data Factory service.",
       "properties": {
@@ -6068,17 +5845,6 @@
       "maxLength": 260,
       "x-ms-parameter-location": "method"
     },
-    "rerunTriggerName": {
-      "name": "rerunTriggerName",
-      "description": "The rerun trigger name.",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "pattern": "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$",
-      "minLength": 1,
-      "maxLength": 260,
-      "x-ms-parameter-location": "method"
-    },
     "runId": {
       "name": "runId",
       "description": "The pipeline run identifier.",
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json
index 5356af606b83..38527af8297b 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json
@@ -572,7 +572,7 @@
               "format": "date-time",
               "description": "The end time for the time period for which restatement is initiated. Only UTC time is currently supported."
             },
-            "maxConcurrency": {
+            "rerunConcurrency": {
               "description": "The max number of parallel time windows (ready for execution) for which a rerun is triggered.",
               "type": "integer",
               "minimum": 1,
@@ -580,9 +580,10 @@
             }
           },
           "required": [
+            "parentTrigger",
             "requestedStartTime",
             "requestedEndTime",
-            "maxConcurrency"
+            "rerunConcurrency"
           ]
         }
       },
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json
deleted file mode 100644
index 1e3d8b98ec8b..000000000000
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Cancel.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "12345678-1234-1234-1234-12345678abc",
-    "resourceGroupName": "exampleResourceGroup",
-    "factoryName": "exampleFactoryName",
-    "triggerName": "exampleTrigger",
-    "rerunTriggerName": "exampleRerunTrigger",
-    "api-version": "2018-06-01"
-  },
-  "responses": {
-    "200": {}
-  }
-}
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json
deleted file mode 100644
index 7463511ef117..000000000000
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Create.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "12345678-1234-1234-1234-12345678abc",
-    "resourceGroupName": "exampleResourceGroup",
-    "factoryName": "exampleFactoryName",
-    "triggerName": "exampleTrigger",
-    "rerunTriggerName": "exampleRerunTrigger",
-    "rerunTumblingWindowTriggerActionParameters": {
-      "startTime": "2018-06-16T00:39:13.8441801Z",
-      "endTime": "2018-06-16T00:55:13.8441801Z",
-      "maxConcurrency": 4
-    },
-    "api-version": "2018-06-01"
-  },
-  "responses": {
-    "200": {
-      "headers": {
-        "Date": "Sat, 16 Jun 2018 00:40:14 GMT",
-        "X-Content-Type-Options": "nosniff",
-        "x-ms-ratelimit-remaining-subscription-writes": "1186",
-        "x-ms-request-id": "373f1a49-685d-4c07-8857-0fcf1bcaffcb",
-        "x-ms-correlation-request-id": "373f1a49-685d-4c07-8857-0fcf1bcaffcb"
-      },
-      "body": {
-        "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/triggers/exampleTrigger/rerunTriggers/exampleRerunTrigger",
-        "name": "exampleRerunTrigger",
-        "type": "Microsoft.DataFactory/factories/triggers/rerunTriggers",
-        "properties": {
-          "type": "RerunTumblingWindowTrigger",
-          "typeProperties": {
-            "requestedStartTime": "2018-06-16T00:39:13.8441801Z",
-            "requestedEndTime": "2018-06-16T00:55:13.8441801Z",
-            "maxConcurrency": 4
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json
deleted file mode 100644
index 1e3d8b98ec8b..000000000000
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Start.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "12345678-1234-1234-1234-12345678abc",
-    "resourceGroupName": "exampleResourceGroup",
-    "factoryName": "exampleFactoryName",
-    "triggerName": "exampleTrigger",
-    "rerunTriggerName": "exampleRerunTrigger",
-    "api-version": "2018-06-01"
-  },
-  "responses": {
-    "200": {}
-  }
-}
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json
deleted file mode 100644
index 1e3d8b98ec8b..000000000000
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_Stop.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "12345678-1234-1234-1234-12345678abc",
-    "resourceGroupName": "exampleResourceGroup",
-    "factoryName": "exampleFactoryName",
-    "triggerName": "exampleTrigger",
-    "rerunTriggerName": "exampleRerunTrigger",
-    "api-version": "2018-06-01"
-  },
-  "responses": {
-    "200": {}
-  }
-}
diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_QueryByFactory.json
similarity index 77%
rename from specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json
rename to specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_QueryByFactory.json
index e6ea096fb88f..7a266ba3b59e 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/RerunTriggers_ListByTrigger.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Triggers_QueryByFactory.json
@@ -4,7 +4,10 @@
     "resourceGroupName": "exampleResourceGroup",
     "factoryName": "exampleFactoryName",
     "triggerName": "exampleTrigger",
-    "api-version": "2018-06-01"
+    "api-version": "2018-06-01",
+    "filterParameters": {
+      "parentTriggerName": "exampleTrigger"
+    }
   },
   "responses": {
     "200": {
@@ -18,15 +21,16 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/triggers/exampleTrigger/rerunTriggers/exampleRerunTrigger",
+            "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/triggers/exampleRerunTrigger",
             "name": "exampleRerunTrigger",
-            "type": "Microsoft.DataFactory/factories/triggers/rerunTriggers",
+            "type": "Microsoft.DataFactory/factories/triggers",
             "properties": {
               "type": "RerunTumblingWindowTrigger",
               "typeProperties": {
+                "parentTrigger": "exampleTrigger",
                 "requestedStartTime": "2018-06-16T00:39:14.905167Z",
                 "requestedEndTime": "2018-06-16T00:55:14.905167Z",
-                "maxConcurrency": 4
+                "rerunConcurrency": 4
               },
               "description": "Example description"
             }