diff --git a/rest-api-spec/api/cat.aliases.json b/rest-api-spec/api/cat.aliases.json
index 9ccdb0b9251..b2085ccef5a 100644
--- a/rest-api-spec/api/cat.aliases.json
+++ b/rest-api-spec/api/cat.aliases.json
@@ -1,12 +1,12 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.aliases": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-aliases.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/aliases",
-      "paths": ["/_cat/aliases", "/_cat/aliases/{alias}"],
+      "paths": ["/_cat/aliases", "/_cat/aliases/{name}"],
       "parts": {
-        "alias": {
+        "name": {
           "type" : "list",
           "description" : "A comma-separated list of alias names to return"
         }
diff --git a/rest-api-spec/api/cat.allocation.json b/rest-api-spec/api/cat.allocation.json
index 4c8825c7c0c..e5d1e68c842 100644
--- a/rest-api-spec/api/cat.allocation.json
+++ b/rest-api-spec/api/cat.allocation.json
@@ -1,12 +1,12 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.allocation": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-allocation.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/allocation",
-      "paths": ["/_cat/allocation", "/_cat/allocation/{nodes}"],
+      "paths": ["/_cat/allocation", "/_cat/allocation/{node_id}"],
       "parts": {
-        "nodes": {
+        "node_id": {
           "type": "list",
           "description": "A comma-separated list of node IDs or names to limit the returned information"
         }
diff --git a/rest-api-spec/api/cat.health.json b/rest-api-spec/api/cat.health.json
index 9019deb8adf..c99ad54e289 100644
--- a/rest-api-spec/api/cat.health.json
+++ b/rest-api-spec/api/cat.health.json
@@ -1,6 +1,6 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.health": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-health.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/health",
diff --git a/rest-api-spec/api/cat.help.json b/rest-api-spec/api/cat.help.json
index 804ec9f83cf..b7c02c775c2 100644
--- a/rest-api-spec/api/cat.help.json
+++ b/rest-api-spec/api/cat.help.json
@@ -1,5 +1,5 @@
 {
-  "cat": {
+  "cat.help": {
     "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
     "methods": ["GET"],
     "url": {
diff --git a/rest-api-spec/api/cat.indices.json b/rest-api-spec/api/cat.indices.json
index 2d3009a60cd..d58ddcc5454 100644
--- a/rest-api-spec/api/cat.indices.json
+++ b/rest-api-spec/api/cat.indices.json
@@ -1,6 +1,6 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.indices": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-indices.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/indices",
diff --git a/rest-api-spec/api/cat.master.json b/rest-api-spec/api/cat.master.json
index 06c389633b6..3702665fc38 100644
--- a/rest-api-spec/api/cat.master.json
+++ b/rest-api-spec/api/cat.master.json
@@ -1,6 +1,6 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.master": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-master.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/master",
diff --git a/rest-api-spec/api/cat.nodes.json b/rest-api-spec/api/cat.nodes.json
index 883eb3c10f0..f530f8d93c3 100644
--- a/rest-api-spec/api/cat.nodes.json
+++ b/rest-api-spec/api/cat.nodes.json
@@ -1,6 +1,6 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.nodes": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-nodes.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/nodes",
diff --git a/rest-api-spec/api/cat.pending_tasks.json b/rest-api-spec/api/cat.pending_tasks.json
index d44ac74d3be..1d8ef364f62 100644
--- a/rest-api-spec/api/cat.pending_tasks.json
+++ b/rest-api-spec/api/cat.pending_tasks.json
@@ -1,6 +1,6 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.pending_tasks": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-pending-tasks.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/pending_tasks",
diff --git a/rest-api-spec/api/cat.shards.json b/rest-api-spec/api/cat.shards.json
index 74d963ac52d..cd7fbf776e4 100644
--- a/rest-api-spec/api/cat.shards.json
+++ b/rest-api-spec/api/cat.shards.json
@@ -1,6 +1,6 @@
 {
-  "cat": {
-    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat.html",
+  "cat.shards": {
+    "documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-shards.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/shards",