diff --git a/api/v1/swagger/paths/config_smtp_servers.json b/api/v1/swagger/paths/config_smtp_servers.json
index 6fad941e74..26009afb4d 100644
--- a/api/v1/swagger/paths/config_smtp_servers.json
+++ b/api/v1/swagger/paths/config_smtp_servers.json
@@ -4,7 +4,7 @@
       "x-mojo-to": "Config::SMTP::Servers#list",
       "operationId": "listSMTPServers",
       "tags": [
-        "SMTP servers"
+        "smtp_servers"
       ],
       "produces": [
         "application/json"
@@ -71,7 +71,7 @@
       "x-mojo-to": "Config::SMTP::Servers#add",
       "operationId": "addSMTPServer",
       "tags": [
-        "SMTP servers"
+        "smtp_servers"
       ],
       "parameters": [
         {
@@ -137,7 +137,7 @@
       "x-mojo-to": "Config::SMTP::Servers#get",
       "operationId": "getSMTPServer",
       "tags": [
-        "SMTP servers"
+        "smtp_servers"
       ],
       "parameters": [
         {
@@ -189,7 +189,7 @@
       "x-mojo-to": "Config::SMTP::Servers#update",
       "operationId": "updateSMTPServer",
       "tags": [
-        "SMTP servers"
+        "smtp_servers"
       ],
       "parameters": [
         {
@@ -256,7 +256,7 @@
       "x-mojo-to": "Config::SMTP::Servers#delete",
       "operationId": "deleteSMTPServer",
       "tags": [
-        "SMTP servers"
+        "smtp_servers"
       ],
       "parameters": [
         {
diff --git a/api/v1/swagger/paths/import_batch_profiles.json b/api/v1/swagger/paths/import_batch_profiles.json
index 14853ab4ba..39436f5fbc 100644
--- a/api/v1/swagger/paths/import_batch_profiles.json
+++ b/api/v1/swagger/paths/import_batch_profiles.json
@@ -4,7 +4,7 @@
       "x-mojo-to": "ImportBatchProfiles#list",
       "operationId": "listImportBatchProfiles",
       "tags": [
-        "ImportBatchProfiles"
+        "batch_import_profiles"
       ],
       "parameters": [
         {
@@ -75,7 +75,7 @@
       "x-mojo-to": "ImportBatchProfiles#add",
       "operationId": "addImportBatchProfiles",
       "tags": [
-        "ImportBatchProfiles"
+        "batch_import_profiles"
       ],
       "parameters": [
         {
@@ -193,7 +193,7 @@
       "x-mojo-to": "ImportBatchProfiles#edit",
       "operationId": "editImportBatchProfiles",
       "tags": [
-        "ImportBatchProfiles"
+        "batch_import_profiles"
       ],
       "parameters": [
         {
@@ -311,7 +311,7 @@
     "delete": {
       "x-mojo-to": "ImportBatchProfiles#delete",
       "operationId": "deleteImportBatchProfiles",
-      "tags": ["ImportBatchProfiles"],
+      "tags": ["batch_import_profiles"],
       "parameters": [{
           "$ref": "../parameters.json#/import_batch_profile_id_pp"
         }
diff --git a/api/v1/swagger/paths/patrons_account.json b/api/v1/swagger/paths/patrons_account.json
index 9033645d39..8956ad2f6f 100644
--- a/api/v1/swagger/paths/patrons_account.json
+++ b/api/v1/swagger/paths/patrons_account.json
@@ -4,7 +4,7 @@
       "x-mojo-to": "Patrons::Account#get",
       "operationId": "getPatronAccount",
       "tags": [
-        "patron"
+        "patrons"
       ],
       "parameters": [
         {
@@ -65,7 +65,7 @@
       "x-mojo-to": "Patrons::Account#add_credit",
       "operationId": "addPatronCredit",
       "tags": [
-        "patron"
+        "patrons"
       ],
       "parameters": [
         {
diff --git a/api/v1/swagger/paths/patrons_password.json b/api/v1/swagger/paths/patrons_password.json
index 2de2e29c92..ae1686179f 100644
--- a/api/v1/swagger/paths/patrons_password.json
+++ b/api/v1/swagger/paths/patrons_password.json
@@ -4,7 +4,7 @@
       "x-mojo-to": "Patrons::Password#set",
       "operationId": "setPatronPassword",
       "tags": [
-        "patron"
+        "patrons"
       ],
       "parameters": [
         {
diff --git a/api/v1/swagger/paths/public_patrons.json b/api/v1/swagger/paths/public_patrons.json
index 7b424d964f..6d1d26c840 100644
--- a/api/v1/swagger/paths/public_patrons.json
+++ b/api/v1/swagger/paths/public_patrons.json
@@ -4,7 +4,7 @@
             "x-mojo-to": "Patrons::Password#set_public",
             "operationId": "setPatronPasswordPublic",
             "tags": [
-                "patron"
+                "patrons"
             ],
             "parameters": [
                 {
@@ -93,7 +93,7 @@
             "x-mojo-to": "Patrons#guarantors_can_see_charges",
             "operationId": "setPatronGuarantorsCanSeeCharges",
             "tags": [
-                "patron"
+                "patrons"
             ],
             "parameters": [
                 {
@@ -169,7 +169,7 @@
             "x-mojo-to": "Patrons#guarantors_can_see_checkouts",
             "operationId": "setPatronGuarantorsCanSeeCheckouts",
             "tags": [
-                "patron"
+                "patrons"
             ],
             "parameters": [
                 {
diff --git a/api/v1/swagger/paths/return_claims.json b/api/v1/swagger/paths/return_claims.json
index b2459c189f..2141f9168d 100644
--- a/api/v1/swagger/paths/return_claims.json
+++ b/api/v1/swagger/paths/return_claims.json
@@ -5,7 +5,7 @@
       "operationId": "claimReturned",
       "summary": "Add a return claim",
       "tags": [
-        "Return claims"
+        "return_claims"
       ],
       "parameters": [
         {
@@ -103,7 +103,7 @@
       "operationId": "updateClaimNotes",
       "summary": "Update notes",
       "tags": [
-        "Return claims"
+        "return_claims"
       ],
       "parameters": [
         {
@@ -193,7 +193,7 @@
       "x-mojo-to": "ReturnClaims#delete_claim",
       "operationId": "deletedClaim",
       "summary": "Delete claim",
-      "tags": [ "Return claims" ],
+      "tags": [ "return_claims" ],
       "parameters": [
         {
           "name": "claim_id",
@@ -262,7 +262,7 @@
       "x-mojo-to": "ReturnClaims#resolve_claim",
       "operationId": "updateClaimResolve",
       "summary": "Resolve claim",
-      "tags": [ "Return claims" ],
+      "tags": [ "return_claims" ],
       "parameters": [
         {
           "name": "claim_id",
diff --git a/api/v1/swagger/swagger.yaml b/api/v1/swagger/swagger.yaml
index bb246f8eb3..b89370491d 100644
--- a/api/v1/swagger/swagger.yaml
+++ b/api/v1/swagger/swagger.yaml
@@ -30,3 +30,84 @@ info:
     This optional header should be passed to give your api request a library
     context; If it is not included in the request, then the request context
     will default to using your api comsumer's assigned home library.
+tags:
+  - name: "biblios"
+    x-displayName: Biblios
+    description: |
+      Manage bibliographic records
+  - name: "cashups"
+    x-displayName: Cashups
+    description: |
+      Manage cash register cashups
+  - name: "checkouts"
+    x-displayName: Checkouts
+    description: |
+      Manage checkouts
+  - name: "cities"
+    x-displayName: Cities
+    description: |
+      Manage cities
+  - name: "clubs"
+    x-displayName: Clubs
+    description: |
+      Manage patron clubs
+  - name: "funds"
+    x-displayName: Funds
+    description: |
+      Manage funds for the acquisitions module
+  - name: "holds"
+    x-displayName: Holds
+    description: |
+      Manage holds
+  - name: "illbackends"
+    x-displayName: ILL backends
+    description: |
+      Manage ILL module backends
+  - name: "illrequests"
+    x-displayName: ILL requests
+    description: |
+      Manage ILL requests
+  - name: "items"
+    x-displayName: Items
+    description: |
+      Manage items
+  - name: "library"
+    x-displayName: Libraries
+    description: |
+      Manage libraries
+  - name: "orders"
+    x-displayName: Orders
+    description: |
+      Manage acquisition orders
+  - name: "oauth"
+    x-displayName: "OAuth"
+    description: |
+      Handle OAuth flows
+  - name: "patrons"
+    x-displayName: Patrons
+    description: |
+      Manage patrons
+  - name: "quotes"
+    x-displayName: Quotes
+    description: |
+      Manage quotes
+  - name: "return_claims"
+    x-displayName: Return claims
+    description: |
+      Manage return claims
+  - name: "smtp_servers"
+    x-displayName: SMTP servers
+    description: |
+      Manage SMTP servers configurations
+  - name: "transfer"
+    x-displayName: Transfer limits
+    description: |
+      Manage transfer limits
+  - name: "vendors"
+    x-displayName: "Vendors"
+    description: |
+      Manage vendors for the acquisitions module
+  - name: "batch_import_profiles"
+    x-displayName: Batch import profiles
+    description: |
+      Manage batch import profiles