diff --git a/pkg/services/apikey/model.go b/pkg/services/apikey/model.go
index fe6c7b03690..c9457b8e845 100644
--- a/pkg/services/apikey/model.go
+++ b/pkg/services/apikey/model.go
@@ -32,7 +32,7 @@ type APIKey struct {
 
 func (k APIKey) TableName() string { return "api_key" }
 
-// swagger:model
+// swagger:model AddAPIKeyCommand
 type AddCommand struct {
 	Name             string       `json:"name" binding:"Required"`
 	Role             org.RoleType `json:"role" binding:"Required"`
diff --git a/public/api-enterprise-spec.json b/public/api-enterprise-spec.json
index 390b81facfb..b2354802cd7 100644
--- a/public/api-enterprise-spec.json
+++ b/public/api-enterprise-spec.json
@@ -1891,7 +1891,7 @@
         }
       }
     },
-    "AddCommand": {
+    "AddAPIKeyCommand": {
       "type": "object",
       "properties": {
         "name": {
@@ -3528,6 +3528,7 @@
           "format": "int64"
         },
         "folderId": {
+          "description": "Deprecated: use FolderUID instead",
           "type": "integer",
           "format": "int64"
         },
@@ -4340,6 +4341,7 @@
           "type": "boolean"
         },
         "id": {
+          "description": "Deprecated: use Uid instead",
           "type": "integer",
           "format": "int64"
         },
diff --git a/public/api-merged.json b/public/api-merged.json
index 08be9a2dab5..b42aafe1368 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -3420,7 +3420,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/AddCommand"
+              "$ref": "#/definitions/AddAPIKeyCommand"
             }
           }
         ],
@@ -10938,7 +10938,7 @@
         }
       }
     },
-    "AddCommand": {
+    "AddAPIKeyCommand": {
       "type": "object",
       "properties": {
         "name": {
diff --git a/public/openapi3.json b/public/openapi3.json
index 8561c4defe2..e3d70acfa71 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -1977,7 +1977,7 @@
         },
         "type": "object"
       },
-      "AddCommand": {
+      "AddAPIKeyCommand": {
         "properties": {
           "name": {
             "type": "string"
@@ -15818,7 +15818,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/AddCommand"
+                "$ref": "#/components/schemas/AddAPIKeyCommand"
               }
             }
           },