diff --git a/2015.03.json b/2015.03.json
index 24776d5a..bd1ddc8c 100644
--- a/2015.03.json
+++ b/2015.03.json
@@ -54,6 +54,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Image operations within the Compute API",
         "flagged": [],
         "name": "compute-images",
@@ -97,6 +98,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Flavor operations in the Compute API",
         "flagged": [],
         "name": "compute-flavors",
@@ -130,6 +132,7 @@
       "admin": false,
       "status": "required",
       "guidelines": ["2014.07", "2015.03"],
+      "project": "nova",
       "description": "Auth related tests using Compute API",
       "flagged": [],
       "name": "compute-auth",
@@ -155,6 +158,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Basic support Compute API for server actions such as reboot, rebuild, resize",
         "flagged": [],
         "name": "compute-instance-actions",
@@ -179,6 +183,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Generate, import, and delete SSH keys within Compute services",
         "flagged": [],
         "name": "compute-keypairs",
@@ -206,6 +211,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Quotas management in Compute API",
         "flagged": [],
         "name": "compute-quotas",
@@ -232,6 +238,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Basic server operations in the Compute API",
         "flagged": [
             "tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filtered_by_ip_regex",
@@ -336,6 +343,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "nova",
         "description": "Retrieve volume information through the Compute API",
         "flagged": [],
         "name": "compute-volume",
@@ -363,6 +371,7 @@
         "admin": false,
         "status": "advisory",
         "guidelines": [],
+        "project": "nova",
         "description": "Manage the access to ip extended attribute for servers through the Compute API",
         "flagged": [],
         "name": "compute-servers-metadata",
@@ -392,6 +401,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "glance",
         "description": "CRUD image operations in Images API v2",
         "flagged": [],
         "name": "images-v2",
@@ -414,6 +424,7 @@
         "admin": false,
         "status": "required",
         "guidelines": ["2014.07", "2015.03"],
+        "project": "swift",
         "description": "Basic object operations in Object Storage API",
         "flagged": [],
         "name": "objectstore-object",
@@ -440,6 +451,7 @@
         "admin": false,
         "status": "advisory",
         "guidelines": [],
+        "project": "keystone",
         "description": "Generate an auth token given an identity endpoint",
         "flagged": [],
         "name": "auth-token",
diff --git a/2015.04.json b/2015.04.json
index f4fce4ce..b2ec90fb 100644
--- a/2015.04.json
+++ b/2015.04.json
@@ -50,7 +50,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Image operations within the Compute API",
         "flagged": [],
         "name": "compute-images",
@@ -93,7 +94,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Flavor operations in the Compute API",
         "flagged": [],
         "name": "compute-flavors",
@@ -126,7 +128,8 @@
       ],
       "admin": false,
       "status": "required",
-      "guidelines": ["2014.07", "2015.03"],
+      "guidelines": ["2014.07", "2015.03", "2015.04"],
+      "project": "nova",
       "description": "Auth related tests using Compute API",
       "flagged": [],
       "name": "compute-auth",
@@ -151,7 +154,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Basic support Compute API for server actions such as reboot, rebuild, resize",
         "flagged": [],
         "name": "compute-instance-actions",
@@ -175,7 +179,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Generate, import, and delete SSH keys within Compute services",
         "flagged": [],
         "name": "compute-keypairs",
@@ -202,7 +207,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Quotas management in Compute API",
         "flagged": [],
         "name": "compute-quotas",
@@ -228,7 +234,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Basic server operations in the Compute API",
         "flagged": [
             "tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filtered_by_ip_regex",
@@ -332,7 +339,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Retrieve volume information through the Compute API",
         "flagged": [],
         "name": "compute-volume",
@@ -360,6 +368,7 @@
         "admin": false,
         "status": "advisory",
         "guidelines": [],
+        "project": "nova",
         "description": "Manage the access to ip extended attribute for servers through the Compute API",
         "flagged": [],
         "name": "compute-servers-metadata",
@@ -388,7 +397,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "glance",
         "description": "CRUD image operations in Images API v2",
         "flagged": [],
         "name": "images-v2",
@@ -410,7 +420,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "swift",
         "description": "Basic object operations in Object Storage API",
         "flagged": [],
         "name": "objectstore-object",
@@ -437,6 +448,7 @@
         "admin": false,
         "status": "advisory",
         "guidelines": [],
+        "project": "keystone",
         "description": "Generate an auth token given an identity endpoint",
         "flagged": [],
         "name": "auth-token",
diff --git a/2015.next.json b/2015.next.json
index 2d83c419..cbef1e71 100644
--- a/2015.next.json
+++ b/2015.next.json
@@ -50,7 +50,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Image operations within the Compute API",
         "flagged": [],
         "name": "compute-images",
@@ -93,7 +94,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Flavor operations in the Compute API",
         "flagged": [],
         "name": "compute-flavors",
@@ -104,6 +106,7 @@
       "admin": false,
       "status": "removed",
       "guidelines": ["2014.07"],
+      "project": "nova",
       "description": "Manage floating IPs through the Compute API.  Not consistently implemented between Nova net and Neutron",
       "flagged": [],
       "name": "Compute Floating IPs",
@@ -126,7 +129,8 @@
       ],
       "admin": false,
       "status": "required",
-      "guidelines": ["2014.07", "2015.03"],
+      "guidelines": ["2014.07", "2015.03", "2015.04"],
+      "project": "nova",
       "description": "Auth related tests using Compute API",
       "flagged": [],
       "name": "compute-auth",
@@ -151,7 +155,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Basic support Compute API for server actions such as reboot, rebuild, resize",
         "flagged": [],
         "name": "compute-instance-actions",
@@ -175,7 +180,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Generate, import, and delete SSH keys within Compute services",
         "flagged": [],
         "name": "compute-keypairs",
@@ -202,7 +208,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Quotas management in Compute API",
         "flagged": [],
         "name": "compute-quotas",
@@ -228,7 +235,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Basic server operations in the Compute API",
         "flagged": [
             "tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filtered_by_ip_regex",
@@ -332,7 +340,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "Retrieve volume information through the Compute API",
         "flagged": [],
         "name": "compute-volume",
@@ -360,6 +369,7 @@
         "admin": false,
         "status": "advisory",
         "guidelines": [],
+        "project": "nova",
         "description": "Manage the access to ip extended attribute for servers through the Compute API",
         "flagged": [],
         "name": "compute-servers-metadata",
@@ -370,6 +380,7 @@
       "admin": false,
       "status": "removed",
       "guidelines": ["2014.07"],
+      "project": "glance",
       "description": "Basic image management in the Images API v1",
       "flagged": [],
       "name": "images-v1",
@@ -388,7 +399,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "nova",
         "description": "CRUD image operations in Images API v2",
         "flagged": [],
         "name": "images-v2",
@@ -410,7 +422,8 @@
         ],
         "admin": false,
         "status": "required",
-        "guidelines": ["2014.07", "2015.03"],
+        "guidelines": ["2014.07", "2015.03", "2015.04"],
+        "project": "swift",
         "description": "Basic object operations in Object Storage API",
         "flagged": [],
         "name": "objectstore-object",
@@ -437,6 +450,7 @@
         "admin": false,
         "status": "advisory",
         "guidelines": [],
+        "project": "keystone",
         "description": "Generate an auth token given an identity endpoint",
         "flagged": [],
         "name": "auth-token",
@@ -448,6 +462,7 @@
     "admin": true,
     "status": "removed",
     "guidelines": ["2014.07"],
+    "project": "nova",
     "description": "CRUD operations for volumes management in Block Storage API",
     "flagged": [],
     "name": "volume",