diff --git a/api-ref/source/flavors.inc b/api-ref/source/flavors.inc
index 07682d3de75d..7f6eaaedac59 100644
--- a/api-ref/source/flavors.inc
+++ b/api-ref/source/flavors.inc
@@ -26,8 +26,8 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-  - sort_key: sort_key
-  - sort_dir: sort_dir
+  - sort_key: sort_key_flavor
+  - sort_dir: sort_dir_flavor
   - limit: limit
   - marker: marker
   - minDisk: minDisk
@@ -128,8 +128,8 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-  - sort_key: sort_key
-  - sort_dir: sort_dir
+  - sort_key: sort_key_flavor
+  - sort_dir: sort_dir_flavor
   - limit: limit
   - marker: marker
   - minDisk: minDisk
diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index 292e0c65cc87..d4bc97d4d041 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -651,7 +651,16 @@ server_status_query:
   in: query
   required: false
   type: string
-sort_dir:
+sort_dir_flavor:
+  description: |
+    Sort direction. A valid value is ``asc`` (ascending) or ``desc`` (descending).
+    Default is ``asc``. You can specify multiple pairs of sort key and sort direction
+    query parameters. If you omit the sort direction in a pair, the API uses the natural
+    sorting direction of the direction of the flavor ``sort_key`` attribute.
+  in: query
+  required: false
+  type: string
+sort_dir_server:
   description: |
     Sort direction. A valid value is ``asc`` (ascending) or ``desc`` (descending).
     Default is ``desc``. You can specify multiple pairs of sort key and sort direction
@@ -660,7 +669,16 @@ sort_dir:
   in: query
   required: false
   type: string
-sort_key:
+sort_key_flavor:
+  description: |
+    Sorts by a flavor attribute. Default attribute is ``flavorid``. You can specify
+    multiple pairs of sort key and sort direction query parameters. If you omit the
+    sort direction in a pair, the API uses the natural sorting direction of the flavor
+    ``sort_key`` attribute.
+  in: query
+  required: false
+  type: string
+sort_key_server:
   description: |
     Sorts by a server attribute. Default attribute is ``created``. You can specify
     multiple pairs of sort key and sort direction query parameters. If you omit the
diff --git a/api-ref/source/servers.inc b/api-ref/source/servers.inc
index b7d2e6aac2f9..8bf3ac36c1ff 100644
--- a/api-ref/source/servers.inc
+++ b/api-ref/source/servers.inc
@@ -159,8 +159,8 @@ Request
 
   - limit: limit
   - marker: marker
-  - sort_key: sort_key
-  - sort_dir: sort_dir
+  - sort_key: sort_key_server
+  - sort_dir: sort_dir_server
   - changes-since: changes_since_server
   - image: image_query
   - flavor: flavor_query
@@ -462,8 +462,8 @@ Request
 
   - limit: limit
   - marker: marker
-  - sort_key: sort_key
-  - sort_dir: sort_dir
+  - sort_key: sort_key_server
+  - sort_dir: sort_dir_server
   - changes-since: changes_since_server
   - image: image_query
   - flavor: flavor_query