diff --git a/dist/compatible/openapi-3.0.yaml b/dist/compatible/openapi-3.0.yaml
index 2d9be8e..f634fb7 100644
--- a/dist/compatible/openapi-3.0.yaml
+++ b/dist/compatible/openapi-3.0.yaml
@@ -135,11 +135,13 @@ security:
 servers:
 - url: https://twitter.com/i/api
 tags:
-- description: response User
+- description: Responses containing User objects.
   name: user
-- description: response User list
+- description: Responses containing List[User] objects.
+  name: users
+- description: Responses containing instruction objects.
   name: user-list
-- description: response tweet
+- description: Responses containing instruction objects.
   name: tweet
 - description: post
   name: post
diff --git a/dist/compatible/paths/user.yaml b/dist/compatible/paths/user.yaml
index 7226106..e7720ea 100644
--- a/dist/compatible/paths/user.yaml
+++ b/dist/compatible/paths/user.yaml
@@ -230,4 +230,4 @@ paths:
               schema:
                 type: string
       tags:
-      - user
+      - users
diff --git a/dist/docs/openapi-3.0.yaml b/dist/docs/openapi-3.0.yaml
index 2d9be8e..f634fb7 100644
--- a/dist/docs/openapi-3.0.yaml
+++ b/dist/docs/openapi-3.0.yaml
@@ -135,11 +135,13 @@ security:
 servers:
 - url: https://twitter.com/i/api
 tags:
-- description: response User
+- description: Responses containing User objects.
   name: user
-- description: response User list
+- description: Responses containing List[User] objects.
+  name: users
+- description: Responses containing instruction objects.
   name: user-list
-- description: response tweet
+- description: Responses containing instruction objects.
   name: tweet
 - description: post
   name: post
diff --git a/dist/docs/paths/user.yaml b/dist/docs/paths/user.yaml
index cb999a3..46d3227 100644
--- a/dist/docs/paths/user.yaml
+++ b/dist/docs/paths/user.yaml
@@ -335,4 +335,4 @@ paths:
               schema:
                 type: string
       tags:
-      - user
+      - users
diff --git a/src/openapi/openapi-3.0.yaml b/src/openapi/openapi-3.0.yaml
index 4f58931..5104625 100644
--- a/src/openapi/openapi-3.0.yaml
+++ b/src/openapi/openapi-3.0.yaml
@@ -56,11 +56,13 @@ security:
   - AuthType: []
 tags:
   - name: user
-    description: response User
+    description: Responses containing User objects.
+  - name: users
+    description: Responses containing List[User] objects.
   - name: user-list
-    description: response User list
+    description: Responses containing instruction objects.
   - name: tweet
-    description: response tweet
+    description: Responses containing instruction objects.
   - name: post
     description: post
   - name: v1.1-get
diff --git a/src/openapi/paths/user.yaml b/src/openapi/paths/user.yaml
index d12620d..a8c8755 100644
--- a/src/openapi/paths/user.yaml
+++ b/src/openapi/paths/user.yaml
@@ -50,7 +50,7 @@ paths:
                   - $ref: "#/components/schemas/UsersResponse"
                   - $ref: "./../schemas/error.yaml#/components/schemas/Errors"
       tags:
-        - "user"
+        - "users"
 
 components:
   schemas:
diff --git a/test/python/test_serialize.py b/test/python/test_serialize.py
index a746ace..763828c 100644
--- a/test/python/test_serialize.py
+++ b/test/python/test_serialize.py
@@ -3,7 +3,6 @@ import os
 import logging
 import base64
 import openapi_client as pt
-from pydantic import BaseModel
 from pathlib import Path
 import time
 
@@ -91,7 +90,7 @@ api_client.user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/5
 
 error_count = 0
 
-for x in [pt.DefaultApi, pt.TweetApi, pt.UserApi, pt.UserListApi]:
+for x in [pt.DefaultApi, pt.TweetApi, pt.UserApi, pt.UsersApi, pt.UserListApi]:
     for props, fn in x.__dict__.items():
         if not callable(fn):
             continue
diff --git a/tools/build_config.py b/tools/build_config.py
index 5f771ad..7f053ac 100644
--- a/tools/build_config.py
+++ b/tools/build_config.py
@@ -39,7 +39,7 @@ class Config:
                     AddPathQueryIdOnParameters(split=-1),
                     getParamHook,
                 ]
-                for key in ["default", "user", "user-list", "tweet"]
+                for key in ["default", "user", "users", "user-list", "tweet"]
             }
             | {
                 key: [