From 4482d8d2ba00b043c39491f650e39563277343f2 Mon Sep 17 00:00:00 2001
From: Brian Murphy <brian.p.murphy@gmail.com>
Date: Tue, 28 Apr 2015 18:43:05 -0400
Subject: [PATCH 1/2] Change watcher REST API call namespace to be watcher.

This change changes the API spec such that all of the watcher APIs are in the `watcher` namespace.

Original commit: elastic/x-pack-elasticsearch@f409ab45693994948c07c8de2099706c307305cb
---
 rest-api-spec/api/{ack_watch.json => watcher.ack.json}     | 7 +------
 .../api/{delete_watch.json => watcher.delete.json}         | 7 +------
 .../api/{execute_watch.json => watcher.execute.json}       | 7 +------
 rest-api-spec/api/{get_watch.json => watcher.get.json}     | 7 +------
 rest-api-spec/api/{watcher_info.json => watcher.info.json} | 2 +-
 rest-api-spec/api/{put_watch.json => watcher.put.json}     | 2 +-
 .../api/{restart_watcher.json => watcher.restart.json}     | 2 +-
 .../api/{start_watcher.json => watcher.start.json}         | 2 +-
 .../api/{watcher_stats.json => watcher.stats.json}         | 7 +------
 rest-api-spec/api/{stop_watcher.json => watcher.stop.json} | 2 +-
 rest-api-spec/test/ack_watch/10_basic.yaml                 | 6 +++---
 rest-api-spec/test/delete_watch/10_basic.yaml              | 4 ++--
 rest-api-spec/test/execute_watch/10_basic.yaml             | 4 ++--
 rest-api-spec/test/execute_watch/20_empty_body.yaml        | 4 ++--
 rest-api-spec/test/get_watch/10_basic.yaml                 | 4 ++--
 rest-api-spec/test/put_watch/10_basic.yaml                 | 2 +-
 rest-api-spec/test/restart_watcher/10_basic.yaml           | 2 +-
 rest-api-spec/test/start_watcher/10_basic.yaml             | 2 +-
 rest-api-spec/test/stats/10_basic.yaml                     | 4 +---
 rest-api-spec/test/stop_watcher/10_basic.yaml              | 4 ++--
 rest-api-spec/test/watch_info/10_basic.yaml                | 2 +-
 21 files changed, 28 insertions(+), 55 deletions(-)
 rename rest-api-spec/api/{ack_watch.json => watcher.ack.json} (74%)
 rename rest-api-spec/api/{delete_watch.json => watcher.delete.json} (73%)
 rename rest-api-spec/api/{execute_watch.json => watcher.execute.json} (77%)
 rename rest-api-spec/api/{get_watch.json => watcher.get.json} (73%)
 rename rest-api-spec/api/{watcher_info.json => watcher.info.json} (93%)
 rename rest-api-spec/api/{put_watch.json => watcher.put.json} (97%)
 rename rest-api-spec/api/{restart_watcher.json => watcher.restart.json} (92%)
 rename rest-api-spec/api/{start_watcher.json => watcher.start.json} (93%)
 rename rest-api-spec/api/{watcher_stats.json => watcher.stats.json} (65%)
 rename rest-api-spec/api/{stop_watcher.json => watcher.stop.json} (93%)

diff --git a/rest-api-spec/api/ack_watch.json b/rest-api-spec/api/watcher.ack.json
similarity index 74%
rename from rest-api-spec/api/ack_watch.json
rename to rest-api-spec/api/watcher.ack.json
index 1db905d7db0..0e46ef7b057 100644
--- a/rest-api-spec/api/ack_watch.json
+++ b/rest-api-spec/api/watcher.ack.json
@@ -1,5 +1,5 @@
 {
-  "ack_watch": {
+  "watcher.ack": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-ack-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null
diff --git a/rest-api-spec/api/delete_watch.json b/rest-api-spec/api/watcher.delete.json
similarity index 73%
rename from rest-api-spec/api/delete_watch.json
rename to rest-api-spec/api/watcher.delete.json
index 6ea5d8e7619..528fce987f5 100644
--- a/rest-api-spec/api/delete_watch.json
+++ b/rest-api-spec/api/watcher.delete.json
@@ -1,5 +1,5 @@
 {
-  "delete_watch": {
+  "watcher.delete": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-delete-watch.html",
     "methods": [ "DELETE" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null
diff --git a/rest-api-spec/api/execute_watch.json b/rest-api-spec/api/watcher.execute.json
similarity index 77%
rename from rest-api-spec/api/execute_watch.json
rename to rest-api-spec/api/watcher.execute.json
index 3fc5416eec2..d5bf3f2b153 100644
--- a/rest-api-spec/api/execute_watch.json
+++ b/rest-api-spec/api/watcher.execute.json
@@ -1,5 +1,5 @@
 {
-  "execute_watch": {
+  "watcher.execute": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-execute-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": {
diff --git a/rest-api-spec/api/get_watch.json b/rest-api-spec/api/watcher.get.json
similarity index 73%
rename from rest-api-spec/api/get_watch.json
rename to rest-api-spec/api/watcher.get.json
index e4d1ca31a01..130a5976fd5 100644
--- a/rest-api-spec/api/get_watch.json
+++ b/rest-api-spec/api/watcher.get.json
@@ -1,5 +1,5 @@
 {
-  "get_watch": {
+  "watcher.get": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-get-watch.html",
     "methods": [ "GET" ],
     "url": {
@@ -13,11 +13,6 @@
         }
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null
diff --git a/rest-api-spec/api/watcher_info.json b/rest-api-spec/api/watcher.info.json
similarity index 93%
rename from rest-api-spec/api/watcher_info.json
rename to rest-api-spec/api/watcher.info.json
index 74b37a8f34d..e8c3d2ff837 100644
--- a/rest-api-spec/api/watcher_info.json
+++ b/rest-api-spec/api/watcher.info.json
@@ -1,5 +1,5 @@
 {
-  "watcher_info": {
+  "watcher.info": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-info.html",
     "methods": [ "GET" ],
     "url": {
diff --git a/rest-api-spec/api/put_watch.json b/rest-api-spec/api/watcher.put.json
similarity index 97%
rename from rest-api-spec/api/put_watch.json
rename to rest-api-spec/api/watcher.put.json
index ee7316161d0..c2692d28db7 100644
--- a/rest-api-spec/api/put_watch.json
+++ b/rest-api-spec/api/watcher.put.json
@@ -1,5 +1,5 @@
 {
-  "put_watch": {
+  "watcher.put": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-put-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
diff --git a/rest-api-spec/api/restart_watcher.json b/rest-api-spec/api/watcher.restart.json
similarity index 92%
rename from rest-api-spec/api/restart_watcher.json
rename to rest-api-spec/api/watcher.restart.json
index 3951d68c470..d8b28f6cf9f 100644
--- a/rest-api-spec/api/restart_watcher.json
+++ b/rest-api-spec/api/watcher.restart.json
@@ -1,5 +1,5 @@
 {
-  "restart_watcher": {
+  "watcher.restart": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html",
     "methods": [ "PUT" ],
     "url": {
diff --git a/rest-api-spec/api/start_watcher.json b/rest-api-spec/api/watcher.start.json
similarity index 93%
rename from rest-api-spec/api/start_watcher.json
rename to rest-api-spec/api/watcher.start.json
index a8fc27ca73a..1dde681bfd1 100644
--- a/rest-api-spec/api/start_watcher.json
+++ b/rest-api-spec/api/watcher.start.json
@@ -1,5 +1,5 @@
 {
-  "start_watcher": {
+  "watcher.start": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html",
     "methods": [ "PUT" ],
     "url": {
diff --git a/rest-api-spec/api/watcher_stats.json b/rest-api-spec/api/watcher.stats.json
similarity index 65%
rename from rest-api-spec/api/watcher_stats.json
rename to rest-api-spec/api/watcher.stats.json
index 4f60345c79c..cd977803a71 100644
--- a/rest-api-spec/api/watcher_stats.json
+++ b/rest-api-spec/api/watcher.stats.json
@@ -1,5 +1,5 @@
 {
-  "watcher_stats": {
+  "watcher.stats": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-stats.html",
     "methods": [ "GET" ],
     "url": {
@@ -8,11 +8,6 @@
       "parts": {
       },
       "params": {
-        "pretty": {
-          "type": "boolean",
-          "description": "Pretty the output",
-          "default": false
-        }
       }
     },
     "body": null
diff --git a/rest-api-spec/api/stop_watcher.json b/rest-api-spec/api/watcher.stop.json
similarity index 93%
rename from rest-api-spec/api/stop_watcher.json
rename to rest-api-spec/api/watcher.stop.json
index f62f5db7b38..f573432d453 100644
--- a/rest-api-spec/api/stop_watcher.json
+++ b/rest-api-spec/api/watcher.stop.json
@@ -1,5 +1,5 @@
 {
-  "stop_watcher": {
+  "watcher.stop": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-service.html",
     "methods": [ "PUT" ],
     "url": {
diff --git a/rest-api-spec/test/ack_watch/10_basic.yaml b/rest-api-spec/test/ack_watch/10_basic.yaml
index 5080824ed27..dc9ce3610ee 100644
--- a/rest-api-spec/test/ack_watch/10_basic.yaml
+++ b/rest-api-spec/test/ack_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put:
         id: "my_watch"
         body:  > 
           {
@@ -43,11 +43,11 @@
           wait_for_status: green
 
   - do:
-    ack_watch:
+    watcher.ack:
       id: "my_watch"
   - match: { "status.ack.state" : "awaits_execution" }
 
   - do:
-    delete_watch:
+    watcher.delete:
       id: "my_watch"
   - match: { found: true }
diff --git a/rest-api-spec/test/delete_watch/10_basic.yaml b/rest-api-spec/test/delete_watch/10_basic.yaml
index 77cf30dd0ff..db3cb5fa70e 100644
--- a/rest-api-spec/test/delete_watch/10_basic.yaml
+++ b/rest-api-spec/test/delete_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put:
         id: "my_watch"
         body:  > 
           {
@@ -39,6 +39,6 @@
   - match: { _id: "my_watch" }
 
   - do:
-    delete_watch:
+    watcher.delete:
       id: "my_watch"
   - match: { found: true }
diff --git a/rest-api-spec/test/execute_watch/10_basic.yaml b/rest-api-spec/test/execute_watch/10_basic.yaml
index 6e26bd4fedd..119dc029cd0 100644
--- a/rest-api-spec/test/execute_watch/10_basic.yaml
+++ b/rest-api-spec/test/execute_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put:
         id: "my_exe_watch"
         body:  > 
           {
@@ -55,7 +55,7 @@
   - match: { _id: "my_exe_watch" }
 
   - do:
-      execute_watch:
+      watcher.execute:
         id: "my_exe_watch"
         body: >
           {
diff --git a/rest-api-spec/test/execute_watch/20_empty_body.yaml b/rest-api-spec/test/execute_watch/20_empty_body.yaml
index 7dc8a3b2064..01188bc2532 100644
--- a/rest-api-spec/test/execute_watch/20_empty_body.yaml
+++ b/rest-api-spec/test/execute_watch/20_empty_body.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put:
         id: "my_logging_watch"
         body:  > 
           {
@@ -53,7 +53,7 @@
   - match: { _id: "my_logging_watch" }
 
   - do:
-      execute_watch:
+      watcher.execute:
         id: "my_logging_watch"
         body: null
 
diff --git a/rest-api-spec/test/get_watch/10_basic.yaml b/rest-api-spec/test/get_watch/10_basic.yaml
index 3533ef6cf35..33c94b51e1e 100644
--- a/rest-api-spec/test/get_watch/10_basic.yaml
+++ b/rest-api-spec/test/get_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put:
         id: "my_watch"
         body:  > 
           {
@@ -41,7 +41,7 @@
   - match: { created: true }
 
   - do:
-      get_watch:
+      watcher.get:
         id: "my_watch"
   - match: { found : true}
   - match: { _id: "my_watch" }
diff --git a/rest-api-spec/test/put_watch/10_basic.yaml b/rest-api-spec/test/put_watch/10_basic.yaml
index c95120ba5b4..69e8602e61e 100644
--- a/rest-api-spec/test/put_watch/10_basic.yaml
+++ b/rest-api-spec/test/put_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      put_watch:
+      watcher.put:
         id: "my_watch"
         body:  > 
           {
diff --git a/rest-api-spec/test/restart_watcher/10_basic.yaml b/rest-api-spec/test/restart_watcher/10_basic.yaml
index 55159a28181..dee6b7fa5b2 100644
--- a/rest-api-spec/test/restart_watcher/10_basic.yaml
+++ b/rest-api-spec/test/restart_watcher/10_basic.yaml
@@ -4,5 +4,5 @@
       cluster.health:
           wait_for_status: green
 
-  - do: {restart_watcher: {}}
+  - do: {watcher.restart: {}}
   - match: { acknowledged: true }
diff --git a/rest-api-spec/test/start_watcher/10_basic.yaml b/rest-api-spec/test/start_watcher/10_basic.yaml
index b7bf9307cf7..1f028099aae 100644
--- a/rest-api-spec/test/start_watcher/10_basic.yaml
+++ b/rest-api-spec/test/start_watcher/10_basic.yaml
@@ -4,5 +4,5 @@
       cluster.health:
           wait_for_status: green
 
-  - do: {start_watcher: {}}
+  - do: {watcher.start: {}}
   - match: { acknowledged: true }
diff --git a/rest-api-spec/test/stats/10_basic.yaml b/rest-api-spec/test/stats/10_basic.yaml
index 8931fe44fed..162e77684ea 100644
--- a/rest-api-spec/test/stats/10_basic.yaml
+++ b/rest-api-spec/test/stats/10_basic.yaml
@@ -1,7 +1,5 @@
 ---
 "Test watcher stats output":
 
-  - do:
-      watcher_stats:
-        pretty: true
+  - do: {watcher.stats: {}}
   - match: { "watch_service_state": "started" }
diff --git a/rest-api-spec/test/stop_watcher/10_basic.yaml b/rest-api-spec/test/stop_watcher/10_basic.yaml
index 526319ab25d..e9179efc7e5 100644
--- a/rest-api-spec/test/stop_watcher/10_basic.yaml
+++ b/rest-api-spec/test/stop_watcher/10_basic.yaml
@@ -4,8 +4,8 @@
       cluster.health:
           wait_for_status: green
 
-  - do: {stop_watcher: {}}
+  - do: {watcher.stop: {}}
   - match: { acknowledged: true }
 
-  - do: {start_watcher: {}}
+  - do: {watcher.start: {}}
   - match: { acknowledged: true }
diff --git a/rest-api-spec/test/watch_info/10_basic.yaml b/rest-api-spec/test/watch_info/10_basic.yaml
index df64f385c9f..e30b7db31e6 100644
--- a/rest-api-spec/test/watch_info/10_basic.yaml
+++ b/rest-api-spec/test/watch_info/10_basic.yaml
@@ -1,6 +1,6 @@
 ---
 "Test watcher info api":
-  - do: {watcher_info: {}}
+  - do: {watcher.info: {}}
   - is_true:    version.build_hash
   - is_true:    version.build_timestamp
   - is_true:    version.build_snapshot

From 94bea8f83a4082475f1fe79f0cdfe9f37652b6a6 Mon Sep 17 00:00:00 2001
From: Brian Murphy <brian.p.murphy@gmail.com>
Date: Tue, 28 Apr 2015 19:08:28 -0400
Subject: [PATCH 2/2] Change the watch specific actions to reflect that they
 operate on watches.

This change changes the watch specific actions put/get/delete/execute/ack to be watcher.<action>_watch.

Original commit: elastic/x-pack-elasticsearch@86a91cb14166bb511d38a277f8f4288df26084ed
---
 pom.xml                                                     | 2 +-
 .../api/{watcher.ack.json => watcher.ack_watch.json}        | 2 +-
 .../api/{watcher.delete.json => watcher.delete_watch.json}  | 2 +-
 .../{watcher.execute.json => watcher.execute_watch.json}    | 2 +-
 .../api/{watcher.get.json => watcher.get_watch.json}        | 2 +-
 .../api/{watcher.put.json => watcher.put_watch.json}        | 2 +-
 rest-api-spec/test/ack_watch/10_basic.yaml                  | 6 +++---
 rest-api-spec/test/delete_watch/10_basic.yaml               | 4 ++--
 rest-api-spec/test/execute_watch/10_basic.yaml              | 4 ++--
 rest-api-spec/test/execute_watch/20_empty_body.yaml         | 4 ++--
 rest-api-spec/test/get_watch/10_basic.yaml                  | 4 ++--
 rest-api-spec/test/put_watch/10_basic.yaml                  | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)
 rename rest-api-spec/api/{watcher.ack.json => watcher.ack_watch.json} (94%)
 rename rest-api-spec/api/{watcher.delete.json => watcher.delete_watch.json} (93%)
 rename rest-api-spec/api/{watcher.execute.json => watcher.execute_watch.json} (94%)
 rename rest-api-spec/api/{watcher.get.json => watcher.get_watch.json} (94%)
 rename rest-api-spec/api/{watcher.put.json => watcher.put_watch.json} (96%)

diff --git a/pom.xml b/pom.xml
index 161ddb0622b..815157c1b55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <tests.heap.size>512m</tests.heap.size>
         <tests.topn>5</tests.topn>
         <execution.hint.file>.local-${project.version}-execution-hints.log</execution.hint.file>
-        <tests.rest>false</tests.rest>
+        <tests.rest>true</tests.rest>
         <tests.slow>false</tests.slow>
         <tests.timewarp>true</tests.timewarp>
     </properties>
diff --git a/rest-api-spec/api/watcher.ack.json b/rest-api-spec/api/watcher.ack_watch.json
similarity index 94%
rename from rest-api-spec/api/watcher.ack.json
rename to rest-api-spec/api/watcher.ack_watch.json
index 0e46ef7b057..e76861619e4 100644
--- a/rest-api-spec/api/watcher.ack.json
+++ b/rest-api-spec/api/watcher.ack_watch.json
@@ -1,5 +1,5 @@
 {
-  "watcher.ack": {
+  "watcher.ack_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-ack-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
diff --git a/rest-api-spec/api/watcher.delete.json b/rest-api-spec/api/watcher.delete_watch.json
similarity index 93%
rename from rest-api-spec/api/watcher.delete.json
rename to rest-api-spec/api/watcher.delete_watch.json
index 528fce987f5..34eda0e8a2c 100644
--- a/rest-api-spec/api/watcher.delete.json
+++ b/rest-api-spec/api/watcher.delete_watch.json
@@ -1,5 +1,5 @@
 {
-  "watcher.delete": {
+  "watcher.delete_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-delete-watch.html",
     "methods": [ "DELETE" ],
     "url": {
diff --git a/rest-api-spec/api/watcher.execute.json b/rest-api-spec/api/watcher.execute_watch.json
similarity index 94%
rename from rest-api-spec/api/watcher.execute.json
rename to rest-api-spec/api/watcher.execute_watch.json
index d5bf3f2b153..33c62b25e68 100644
--- a/rest-api-spec/api/watcher.execute.json
+++ b/rest-api-spec/api/watcher.execute_watch.json
@@ -1,5 +1,5 @@
 {
-  "watcher.execute": {
+  "watcher.execute_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-execute-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
diff --git a/rest-api-spec/api/watcher.get.json b/rest-api-spec/api/watcher.get_watch.json
similarity index 94%
rename from rest-api-spec/api/watcher.get.json
rename to rest-api-spec/api/watcher.get_watch.json
index 130a5976fd5..ee9ba11c1ee 100644
--- a/rest-api-spec/api/watcher.get.json
+++ b/rest-api-spec/api/watcher.get_watch.json
@@ -1,5 +1,5 @@
 {
-  "watcher.get": {
+  "watcher.get_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-get-watch.html",
     "methods": [ "GET" ],
     "url": {
diff --git a/rest-api-spec/api/watcher.put.json b/rest-api-spec/api/watcher.put_watch.json
similarity index 96%
rename from rest-api-spec/api/watcher.put.json
rename to rest-api-spec/api/watcher.put_watch.json
index c2692d28db7..6e2b6a1b8a1 100644
--- a/rest-api-spec/api/watcher.put.json
+++ b/rest-api-spec/api/watcher.put_watch.json
@@ -1,5 +1,5 @@
 {
-  "watcher.put": {
+  "watcher.put_watch": {
     "documentation": "http://www.elastic.co/guide/en/watcher/current/appendix-api-put-watch.html",
     "methods": [ "PUT", "POST" ],
     "url": {
diff --git a/rest-api-spec/test/ack_watch/10_basic.yaml b/rest-api-spec/test/ack_watch/10_basic.yaml
index dc9ce3610ee..9f7d91fb32c 100644
--- a/rest-api-spec/test/ack_watch/10_basic.yaml
+++ b/rest-api-spec/test/ack_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      watcher.put:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {
@@ -43,11 +43,11 @@
           wait_for_status: green
 
   - do:
-    watcher.ack:
+    watcher.ack_watch:
       id: "my_watch"
   - match: { "status.ack.state" : "awaits_execution" }
 
   - do:
-    watcher.delete:
+    watcher.delete_watch:
       id: "my_watch"
   - match: { found: true }
diff --git a/rest-api-spec/test/delete_watch/10_basic.yaml b/rest-api-spec/test/delete_watch/10_basic.yaml
index db3cb5fa70e..74fc27a2b93 100644
--- a/rest-api-spec/test/delete_watch/10_basic.yaml
+++ b/rest-api-spec/test/delete_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      watcher.put:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {
@@ -39,6 +39,6 @@
   - match: { _id: "my_watch" }
 
   - do:
-    watcher.delete:
+    watcher.delete_watch:
       id: "my_watch"
   - match: { found: true }
diff --git a/rest-api-spec/test/execute_watch/10_basic.yaml b/rest-api-spec/test/execute_watch/10_basic.yaml
index 119dc029cd0..fd92854bfb2 100644
--- a/rest-api-spec/test/execute_watch/10_basic.yaml
+++ b/rest-api-spec/test/execute_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      watcher.put:
+      watcher.put_watch:
         id: "my_exe_watch"
         body:  > 
           {
@@ -55,7 +55,7 @@
   - match: { _id: "my_exe_watch" }
 
   - do:
-      watcher.execute:
+      watcher.execute_watch:
         id: "my_exe_watch"
         body: >
           {
diff --git a/rest-api-spec/test/execute_watch/20_empty_body.yaml b/rest-api-spec/test/execute_watch/20_empty_body.yaml
index 01188bc2532..98d2258c801 100644
--- a/rest-api-spec/test/execute_watch/20_empty_body.yaml
+++ b/rest-api-spec/test/execute_watch/20_empty_body.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      watcher.put:
+      watcher.put_watch:
         id: "my_logging_watch"
         body:  > 
           {
@@ -53,7 +53,7 @@
   - match: { _id: "my_logging_watch" }
 
   - do:
-      watcher.execute:
+      watcher.execute_watch:
         id: "my_logging_watch"
         body: null
 
diff --git a/rest-api-spec/test/get_watch/10_basic.yaml b/rest-api-spec/test/get_watch/10_basic.yaml
index 33c94b51e1e..c39060b2c2c 100644
--- a/rest-api-spec/test/get_watch/10_basic.yaml
+++ b/rest-api-spec/test/get_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      watcher.put:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {
@@ -41,7 +41,7 @@
   - match: { created: true }
 
   - do:
-      watcher.get:
+      watcher.get_watch:
         id: "my_watch"
   - match: { found : true}
   - match: { _id: "my_watch" }
diff --git a/rest-api-spec/test/put_watch/10_basic.yaml b/rest-api-spec/test/put_watch/10_basic.yaml
index 69e8602e61e..e132aecbf25 100644
--- a/rest-api-spec/test/put_watch/10_basic.yaml
+++ b/rest-api-spec/test/put_watch/10_basic.yaml
@@ -5,7 +5,7 @@
           wait_for_status: green
 
   - do:
-      watcher.put:
+      watcher.put_watch:
         id: "my_watch"
         body:  > 
           {