diff --git a/static/monorail-2.0.yaml b/static/monorail-2.0.yaml
index abd1f6105..5340719fa 100644
--- a/static/monorail-2.0.yaml
+++ b/static/monorail-2.0.yaml
@@ -1,7 +1,14 @@
 info:
-  title: rackhd api 
+  title: rackhd api
   version: "5.0.0"
 basePath: /api/2.0
+securityDefinitions:
+  JWT:
+    type: apiKey
+    name: Authorization
+    in: header
+security:
+- JWT: []
 consumes:
 - application/json
 definitions:
@@ -24,7 +31,7 @@ definitions:
         type: array
     required:
     - message
-  Lookups.2.0_LookupBase:
+  LookupBase:
     description: A lookup record
     properties:
       ipAddress:
@@ -42,6 +49,13 @@ definitions:
         type: string
     required:
     - message
+  NodePatchTags:
+    description: Request body for patching node tags
+    properties:
+      tags:
+        items:
+          type: string
+        type: array
   action:
     description: Action object
     properties:
@@ -69,7 +83,7 @@ definitions:
         type: string
       password:
         type: string
-  hooks.2.0_HookBase:
+  HookBase:
     description: Hook base schema
     type: object
     properties:
@@ -82,8 +96,8 @@ definitions:
         type: array
         items:
           type: object
-  hooks.2.0_HookPost:
-    description: Hook post schema 
+  HookPost:
+    description: Hook post schema
     type: object
     properties:
       url:
@@ -121,13 +135,13 @@ definitions:
     - service
     - config
     type: object
-  node.2.0_GetNode:
+  GetNode:
     description: Get a node from RackHD
     properties:
-      identifier:
+      id:
         type: string
       autoDiscover:
-        type: boolean
+        type: string
       bootSettings:
         type: object
       identifiers:
@@ -162,11 +176,11 @@ definitions:
         - rack
         type: string
     type: object
-  node.2.0_PartialNode:
+  PartialNode:
     description: Post a node into RackHD
     properties:
       autoDiscover:
-        type: boolean
+        type: string
       bootSettings:
         type: object
       identifiers:
@@ -232,10 +246,10 @@ definitions:
       node:
         type: string
       config:
-        type: object  
+        type: object
       service:
         type: string
-  poller.2.0_PartialPoller:
+  PartialPoller:
     description: A poller for periodic collection of telemetry data
     properties:
       config:
@@ -322,7 +336,7 @@ definitions:
         type: array
       role:
         type: string
-  skus.2.0_SkusUpsert:
+  SkusUpsert:
     description: A sku for RackHD
     properties:
       discoveryGraphName:
@@ -469,7 +483,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get all catalogs
       tags:
-      - /api/2.0
+      - catalogs
       x-authentication-type:
       - jwt
       x-privileges:
@@ -498,7 +512,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get a catalog
       tags:
-      - /api/2.0
+      - catalogs
       x-authentication-type:
       - jwt
       x-privileges:
@@ -521,14 +535,14 @@ paths:
           description: Successfully retrieved the catalog
           schema:
             type: object
-                       
+
         default:
           description: Error
           schema:
             $ref: '#/definitions/ErrorResponse'
       summary: Get a firmware catalog
       tags:
-      - /api/2.0
+      - catalogs
       x-authentication-type:
       - jwt
       x-privileges:
@@ -550,7 +564,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get server configuration
       tags:
-      - /api/2.0
+      - config
       x-authentication-type:
       - jwt
       x-privileges:
@@ -579,7 +593,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch server configuration
       tags:
-      - /api/2.0
+      -  config
       x-authentication-type:
       - jwt
       x-privileges:
@@ -608,7 +622,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch server configuration
       tags:
-      - /api/2.0
+      - config
       x-authentication-type:
       - jwt
       x-privileges:
@@ -634,7 +648,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get all files
       tags:
-      - /api/2.0
+      - files
       x-authentication-type:
       - jwt
       x-privileges:
@@ -668,7 +682,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a file
       tags:
-      - /api/2.0
+      - files
       x-authentication-type:
       - jwt
       x-privileges:
@@ -702,7 +716,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a file
       tags:
-      - /api/2.0
+      -  files
       x-authentication-type:
       - jwt
       x-privileges:
@@ -735,7 +749,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put a file
       tags:
-      - /api/2.0
+      - files
       x-authentication-type:
       - jwt
       x-privileges:
@@ -772,7 +786,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get md5sum of file
       tags:
-      - /api/2.0
+      - files
       x-authentication-type:
       - jwt
       x-privileges:
@@ -809,7 +823,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get file metadata
       tags:
-      - /api/2.0
+      - files
       x-authentication-type:
       - jwt
       x-privileges:
@@ -827,7 +841,8 @@ paths:
         List all static files
       description: |
         List all static files
-      tags: [ "/api/2.0" ]
+      tags:
+      - files
       responses:
         200:
           description: array of all
@@ -839,7 +854,6 @@ paths:
           description: Unexpected error
           schema:
             $ref: '#/definitions/Error'
-
   /ibms:
     get:
       description: Get a list of all In Band Management settings that have been associated
@@ -856,7 +870,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of all IBM service instances
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -889,7 +903,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put an IBM service
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -915,7 +929,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of IBMS services
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -943,7 +957,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get an IBMS service definition
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -975,7 +989,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete IBMS settings
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1001,7 +1015,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get an IBMS service
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1038,7 +1052,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch IBMS settings
       tags:
-      - /api/2.0
+      - ibms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1056,14 +1070,14 @@ paths:
           schema:
             type: array
             items:
-              $ref: "#/definitions/hooks.2.0_HookBase"
+              $ref: "#/definitions/HookBase"
         default:
           description: Unexpected error
           schema:
             $ref: '#/definitions/Error'
       summary: Get all hooks
       tags:
-      - /api/2.0
+      - hooks
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1081,7 +1095,7 @@ paths:
         name: body
         required: true
         schema:
-            $ref: '#/definitions/hooks.2.0_HookPost'
+            $ref: '#/definitions/HookPost'
       responses:
         201:
           description: Successfully created new hook
@@ -1097,7 +1111,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a hook
       tags:
-      - /api/2.0
+      - hooks
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1127,7 +1141,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a hook
       tags:
-      - /api/2.0
+      - hooks
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1160,7 +1174,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a hook
       tags:
-      - /api/2.0
+      - hooks
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1180,7 +1194,7 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/hooks.2.0_HookBase'
+          $ref: '#/definitions/HookBase'
       responses:
         200:
           description: Successfully modified the hook
@@ -1196,7 +1210,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch a hook
       tags:
-        - /api/2.0
+        - hooks
       x-authentication-type:
         - jwt
       x-privileges:
@@ -1221,7 +1235,7 @@ paths:
           description: Successfully retrieved the list of lookups
           schema:
             items:
-              $ref: '#/definitions/Lookups.2.0_LookupBase'
+              $ref: '#/definitions/LookupBase'
             type: array
         default:
           description: Unexpected error
@@ -1229,7 +1243,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a list of lookups
       tags:
-      - /api/2.0
+      - lookups
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1244,19 +1258,19 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/Lookups.2.0_LookupBase'
+          $ref: '#/definitions/LookupBase'
       responses:
         201:
           description: Successfully created new lookup
           schema:
-            $ref: '#/definitions/Lookups.2.0_LookupBase'
+            $ref: '#/definitions/LookupBase'
         default:
           description: Unexpected error
           schema:
             $ref: '#/definitions/Error'
       summary: Post a lookup
       tags:
-      - /api/2.0
+      - lookups
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1287,7 +1301,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a lookup
       tags:
-      - /api/2.0
+      - lookups
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1307,7 +1321,7 @@ paths:
           description: Successfully retrieved the lookup
           schema:
             items:
-              $ref: '#/definitions/Lookups.2.0_LookupBase'
+              $ref: '#/definitions/LookupBase'
             type: array
         default:
           description: Unexpected error
@@ -1315,7 +1329,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a lookup
       tags:
-      - /api/2.0
+      - lookups
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1335,12 +1349,12 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/Lookups.2.0_LookupBase'
+          $ref: '#/definitions/LookupBase'
       responses:
         200:
           description: Successfully modified the lookup
           schema:
-            $ref: '#/definitions/Lookups.2.0_LookupBase'
+            $ref: '#/definitions/LookupBase'
         404:
           description: The specified lookup was not found
           schema:
@@ -1351,7 +1365,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch a lookup
       tags:
-      - /api/2.0
+      - lookups
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1385,7 +1399,7 @@ paths:
           description: Successfully retrieved the list of nodes
           schema:
             items:
-              $ref: '#/definitions/node.2.0_GetNode'
+              $ref: '#/definitions/GetNode'
             type: array
         400:
           description: Bad Request
@@ -1397,7 +1411,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a list of nodes
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1413,7 +1427,7 @@ paths:
         name: identifiers
         required: true
         schema:
-          $ref: '#/definitions/node.2.0_PartialNode'
+          $ref: '#/definitions/PartialNode'
       responses:
         201:
           description: Successfully created node
@@ -1425,7 +1439,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1450,7 +1464,7 @@ paths:
           description: The tag name identifier was not found
       summary: Delete nodes tag
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1480,7 +1494,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1500,7 +1514,7 @@ paths:
           description: Successfully retrieved the specified node
           schema:
             items:
-              $ref: '#/definitions/node.2.0_GetNode'
+              $ref: '#/definitions/GetNode'
             type: array
         404:
           description: The specified node was not found
@@ -1512,7 +1526,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1533,12 +1547,12 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/node.2.0_PartialNode'
+          $ref: '#/definitions/PartialNode'
       responses:
         200:
           description: Successfully modified the specified node
           schema:
-            $ref: '#/definitions/node.2.0_PartialNode'
+            $ref: '#/definitions/PartialNode'
         404:
           description: The specified node was not found
           schema:
@@ -1549,7 +1563,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1581,7 +1595,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the catalogs for a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1620,7 +1634,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the catalogs for a node by source
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1650,7 +1664,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get all OBM services
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1687,7 +1701,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put an OBM service
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1723,7 +1737,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the pollers for a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1761,7 +1775,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Remove relations from a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1794,7 +1808,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a nodes relations
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1834,7 +1848,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Add relationships between nodes
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1867,7 +1881,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the ssh settings for a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1901,7 +1915,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post ssh settings
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1936,7 +1950,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get node tags
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -1956,7 +1970,7 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/post_tags'
+          $ref: '#/definitions/NodePatchTags'
       responses:
         200:
           description: Successfully modified node tag(s).
@@ -1972,7 +1986,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch node tags
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2008,7 +2022,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a tag from a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2047,7 +2061,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get all workflows for a node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2062,7 +2076,7 @@ paths:
         name: identifier
         required: true
         type: string
-      - description: 
+      - description:
           The name property set to the injectableName property of the workflow graph
         in: body
         name: body
@@ -2089,7 +2103,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post workflow for the node
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2129,7 +2143,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Perform an action on a workflow
       tags:
-      - /api/2.0
+      - nodes
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2156,7 +2170,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of all OBM service instances
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2189,7 +2203,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put an OBM service
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2214,7 +2228,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of OBM services
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2242,7 +2256,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get an OBM service definition
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2277,7 +2291,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Set identify light status
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2309,7 +2323,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete OBM settings
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2335,7 +2349,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get an OBM service
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2372,7 +2386,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch OBM settings
       tags:
-      - /api/2.0
+      - obms
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2414,7 +2428,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a list of all active pollers
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2434,7 +2448,7 @@ paths:
         name: content
         required: true
         schema:
-          $ref: '#/definitions/poller.2.0_PartialPoller'
+          $ref: '#/definitions/PartialPoller'
       responses:
         201:
           description: Poller created successfully
@@ -2446,7 +2460,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2470,7 +2484,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a list of possible pollers
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2504,7 +2518,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2534,7 +2548,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2566,7 +2580,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2587,7 +2601,7 @@ paths:
         name: content
         required: true
         schema:
-          $ref: '#/definitions/poller.2.0_PartialPoller'
+          $ref: '#/definitions/PartialPoller'
       responses:
         200:
           description: Poller was successfully modified
@@ -2603,7 +2617,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch a poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2643,7 +2657,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get output data for a poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2680,13 +2694,66 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get latest data for a poller
       tags:
-      - /api/2.0
+      - pollers
       x-authentication-type:
       - jwt
       x-privileges:
       - Read
       - pollersRead
     x-swagger-router-controller: pollers
+  /profiles:
+    get:
+      description: >
+        Get the list of currently defined profiles. Profiles are scripts
+        used by RackHD to control how a node PXE boots.
+      operationId: profilesGet
+      parameters:
+      - collectionFormat: multi
+        description: List of valid MAC addresses to lookup
+        in: query
+        items:
+          type: string
+        name: macs
+        required: false
+        type: array
+      - collectionFormat: multi
+        description: List of IP addresses to lookup
+        in: query
+        items:
+          type: string
+        name: ips
+        required: false
+        type: array
+      - description:
+          When macs parameter is not passed, passed with IP adds MAC address to lookup
+        in: query
+        name: mac
+        required: false
+        type: string
+      - description:
+          When macs parameters is not passed, passed with MAC adds IP address to lookup
+        in: query
+        name: ip
+        required: false
+        type: string
+      responses:
+        200:
+          description: Successfully retrieved a list of profiles for specified mac / ip
+          schema:
+            type: object
+        default:
+          description: Unexpected error
+          schema:
+            $ref: '#/definitions/Error'
+      summary: Get list of profiles
+      tags:
+      - profiles
+      x-authentication-type:
+      - jwt
+      x-privileges:
+      - Read
+      - profilesRead
+    x-swagger-router-controller: profiles
   /profiles/library/{name}:
     get:
       description: Get the contents of a profile specified by its name.
@@ -2717,7 +2784,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get contents of a profile
       tags:
-      - /api/2.0
+      - profiles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2755,7 +2822,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put a profile
       tags:
-      - /api/2.0
+      - profiles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2777,7 +2844,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of profile metadata
       tags:
-      - /api/2.0
+      - profiles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2815,7 +2882,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified profiles metadata from database
       tags:
-      - /api/2.0
+      - profiles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2850,7 +2917,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a switch error
       tags:
-      - /api/2.0
+      - profiles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2882,7 +2949,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a profile
       tags:
-      - /api/2.0
+      - profiles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2910,7 +2977,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the list of roles
       tags:
-      - /api/2.0
+      - roles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -2945,7 +3012,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a new role
       tags:
-      - /api/2.0
+      - roles
       x-authentication-type:
       - jwt
       - anonymous
@@ -2979,7 +3046,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a role
       tags:
-      - /api/2.0
+      - roles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3011,7 +3078,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a role
       tags:
-      - /api/2.0
+      - roles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3051,7 +3118,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch a role
       tags:
-      - /api/2.0
+      - roles
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3073,7 +3140,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get all schemas
       tags:
-      - /api/2.0
+      - schemas
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3095,7 +3162,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get all task schemas names
       tags:
-      - /api/2.0
+      - schemas
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3123,7 +3190,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get a task schema
       tags:
-      - /api/2.0
+      - schemas
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3151,7 +3218,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get a schema
       tags:
-      - /api/2.0
+      - schemas
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3177,14 +3244,14 @@ paths:
           schema:
             type: array
             items:
-              $ref: '#/definitions/skus.2.0_SkusUpsert'
+              $ref: '#/definitions/SkusUpsert'
         default:
           description: Unexpected error
           schema:
             $ref: '#/definitions/Error'
       summary: Get list of SKUs
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3200,7 +3267,7 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/skus.2.0_SkusUpsert'
+          $ref: '#/definitions/SkusUpsert'
       responses:
         201:
           description: Successfully created the SKU
@@ -3216,7 +3283,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3232,7 +3299,7 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/skus.2.0_SkusUpsert'
+          $ref: '#/definitions/SkusUpsert'
       responses:
         201:
           description: Successfully created or updated SKU definition
@@ -3248,7 +3315,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put a SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3276,7 +3343,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a SKU Pack
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3308,7 +3375,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3338,7 +3405,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3359,7 +3426,7 @@ paths:
         name: body
         required: true
         schema:
-          $ref: '#/definitions/skus.2.0_SkusUpsert'
+          $ref: '#/definitions/SkusUpsert'
       responses:
         200:
           description: Successfully modified the specified SKU
@@ -3379,7 +3446,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch a SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3402,7 +3469,7 @@ paths:
           schema:
             type: array
             items:
-              $ref: '#/definitions/node.2.0_GetNode'
+              $ref: '#/definitions/GetNode'
         404:
           description: The SKU with the specified identifier was not found
           schema:
@@ -3413,7 +3480,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get nodes for specific SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3448,7 +3515,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete a SKU Pack
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3480,7 +3547,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put a SKU Pack to the specified SKU
       tags:
-      - /api/2.0
+      - skus
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3517,7 +3584,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get all tags
       tags:
-      - /api/2.0
+      - tags
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3549,7 +3616,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a tag
       tags:
-      - /api/2.0
+      - tags
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3582,7 +3649,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified tag
       tags:
-      - /api/2.0
+      - tags
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3612,7 +3679,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a tag
       tags:
-      - /api/2.0
+      - tags
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3647,7 +3714,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get nodes with the specified tag
       tags:
-      - /api/2.0
+      - tags
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3690,7 +3757,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post workflow to node by tag
       tags:
-      - /api/2.0
+      - tags
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3719,7 +3786,7 @@ paths:
             $ref: '#/definitions/ErrorResponse'
       summary: Get tasks bootstrap.js
       tags:
-      - /api/2.0
+      - tasks
     x-swagger-router-controller: tasks
   /tasks/{identifier}:
     get:
@@ -3746,7 +3813,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified task
       tags:
-      - /api/2.0
+      - tasks
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3782,7 +3849,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a task
       tags:
-      - /api/2.0
+      - tasks
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3818,7 +3885,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified template
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3854,7 +3921,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified template
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3893,7 +3960,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Create or update the specified template
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3925,7 +3992,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a list of metadata for all templates
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -3964,7 +4031,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the metadata for the specified template
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4010,7 +4077,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified template
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4054,7 +4121,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get headers of the specified template
       tags:
-      - /api/2.0
+      - templates
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4092,7 +4159,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the list of users
       tags:
-      - /api/2.0
+      - users
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4132,7 +4199,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Post a new user
       tags:
-      - /api/2.0
+      - users
       x-authentication-type:
       - jwt
       - anonymous
@@ -4169,7 +4236,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified user
       tags:
-      - /api/2.0
+      - users
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4203,7 +4270,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified user
       tags:
-      - /api/2.0
+      - users
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4244,7 +4311,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Patch the specified user
       tags:
-      - /api/2.0
+      - users
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4272,7 +4339,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get all views
       tags:
-      - /api/2.0
+      - views
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4305,7 +4372,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified view
       tags:
-      - /api/2.0
+      - views
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4335,7 +4402,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified view
       tags:
-      - /api/2.0
+      - views
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4361,7 +4428,7 @@ paths:
             type: object
       summary: Put the specified view
       tags:
-      - /api/2.0
+      - views
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4405,7 +4472,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get a list of workflow instances
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4448,7 +4515,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Run a workflow
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4470,7 +4537,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of workflow graphs
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4502,7 +4569,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put a graph
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4536,7 +4603,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified workflow graph
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4564,7 +4631,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified workflow graph
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4587,7 +4654,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get list of workflow tasks
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4619,7 +4686,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Put a workflow task
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4652,7 +4719,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified workflow task
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4679,7 +4746,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified workflow task
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4712,7 +4779,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Delete the specified workflow
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4738,7 +4805,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Get the specified workflow
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4779,7 +4846,7 @@ paths:
             $ref: '#/definitions/Error'
       summary: Perform an action on the specified workflow
       tags:
-      - /api/2.0
+      - workflows
       x-authentication-type:
       - jwt
       x-privileges:
@@ -4812,7 +4879,7 @@ paths:
             schema:
               $ref: '#/definitions/Error'
         tags:
-        - /api/2.0
+        - notifications
       x-swagger-router-controller: notification
 produces:
 - application/json
@@ -4820,6 +4887,3 @@ schemes:
 - http
 - https
 swagger: '2.0'
-tags:
-- description: RackHD 2.0 API
-  name: /api/2.0
diff --git a/static/schemas/2.0/node.2.0.json b/static/schemas/2.0/node.2.0.json
index 9e88cab72..55f84b42a 100644
--- a/static/schemas/2.0/node.2.0.json
+++ b/static/schemas/2.0/node.2.0.json
@@ -7,7 +7,7 @@
             "properties": {
                 "autoDiscover": {
                     "description": "Enable automatic discovery",
-                    "type": "boolean"
+                    "type": "string"
                 },
                 "name": {
                     "description": "Name of the node",