diff --git a/spec/namespaces/cat.yaml b/spec/namespaces/cat.yaml
index 363b79a44..9e6f27684 100644
--- a/spec/namespaces/cat.yaml
+++ b/spec/namespaces/cat.yaml
@@ -1105,7 +1105,7 @@ components:
       in: query
       description: The unit in which to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
     cat.all_pit_segments::query.format:
       name: format
       in: query
@@ -1164,7 +1164,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.allocation::query.cluster_manager_timeout:
       name: cluster_manager_timeout
@@ -1374,7 +1374,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.fielddata::query.fields:
       in: query
@@ -1503,7 +1503,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.indices::query.cluster_manager_timeout:
       name: cluster_manager_timeout
@@ -1754,7 +1754,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.nodes::query.cluster_manager_timeout:
       name: cluster_manager_timeout
@@ -1924,7 +1924,7 @@ components:
       in: query
       description: The unit in which to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
     cat.pit_segments::query.format:
       name: format
       in: query
@@ -2062,7 +2062,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.recovery::query.detailed:
       in: query
@@ -2233,7 +2233,7 @@ components:
       in: query
       description: The unit in which to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
     cat.segment_replication::query.completed_only:
       name: completed_only
       in: query
@@ -2365,7 +2365,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.segments::query.cluster_manager_timeout:
       name: cluster_manager_timeout
@@ -2444,7 +2444,7 @@ components:
       name: bytes
       description: The unit used to display byte values.
       schema:
-        $ref: '../schemas/_common.yaml#/components/schemas/StorageType'
+        $ref: '../schemas/_common.yaml#/components/schemas/ByteUnit'
       style: form
     cat.shards::query.cluster_manager_timeout:
       name: cluster_manager_timeout
diff --git a/spec/namespaces/indices.yaml b/spec/namespaces/indices.yaml
index e3e0926f4..b3cc12eb7 100644
--- a/spec/namespaces/indices.yaml
+++ b/spec/namespaces/indices.yaml
@@ -2385,10 +2385,10 @@ components:
                 items:
                   $ref: '../schemas/indices.data_streams_stats.yaml#/components/schemas/DataStreamsStatsItem'
               total_store_sizes:
-                $ref: '../schemas/_common.yaml#/components/schemas/StorageSize'
+                $ref: '../schemas/_common.yaml#/components/schemas/HumanReadableByteCount'
               total_store_size_bytes:
                 description: Total size, in bytes, of all shards for the selected data streams.
-                $ref: '../schemas/_common.yaml#/components/schemas/Bytes'
+                $ref: '../schemas/_common.yaml#/components/schemas/ByteCount'
             required:
               - _shards
               - backing_indices
diff --git a/spec/schemas/_common.yaml b/spec/schemas/_common.yaml
index 39eca3980..9535014a0 100644
--- a/spec/schemas/_common.yaml
+++ b/spec/schemas/_common.yaml
@@ -725,10 +725,10 @@ components:
             $ref: '#/components/schemas/NodeId'
     NodeId:
       type: string
-    StorageSize:
+    HumanReadableByteCount:
       type: string
       pattern: '\d+(\.\d+)?(b|kb|k|mb|m|gb|g|tb|t|pb|p)'
-    StorageType:
+    ByteUnit:
       type: string
       enum:
         - b
@@ -742,8 +742,9 @@ components:
         - pb
         - t
         - tb
-    Bytes:
+    ByteCount:
       type: integer
+      format: int64
     Percentage:
       oneOf:
         - type: string
@@ -928,9 +929,9 @@ components:
       properties:
         size_in_bytes:
           description: Total amount, in bytes, of memory used for completion across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         fields:
           type: object
           additionalProperties:
@@ -941,9 +942,9 @@ components:
       type: object
       properties:
         size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - size_in_bytes
     DocStats:
@@ -968,9 +969,9 @@ components:
         evictions:
           type: number
         memory_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         memory_size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         fields:
           type: object
           additionalProperties:
@@ -981,9 +982,9 @@ components:
       type: object
       properties:
         memory_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         memory_size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - memory_size_in_bytes
     QueryCacheStats:
@@ -1004,10 +1005,10 @@ components:
           description: Total count of query cache hits across all shards assigned to selected nodes.
           type: number
         memory_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         memory_size_in_bytes:
           description: Total amount, in bytes, of memory used for the query cache across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         miss_count:
           description: Total count of query cache misses across all shards assigned to selected nodes.
           type: number
@@ -1074,22 +1075,22 @@ components:
       properties:
         failed:
           description: The number of bytes that failed to upload to the remote translog store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         failed_bytes:
           description: The number of bytes that failed to upload to the remote translog store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         started:
           description: The number of bytes successfully uploaded to the remote translog store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         started_bytes:
           description: The number of bytes successfully uploaded to the remote translog store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         succeeded:
           description: The number of bytes successfully uploaded to the remote translog store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         succeeded_bytes:
           description: The number of bytes successfully uploaded to the remote translog store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - failed_bytes
         - started_bytes
@@ -1128,22 +1129,22 @@ components:
       properties:
         failed:
           description: The number of bytes that failed to upload/upload to/from the remote segment store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         failed_bytes:
           description: The number of bytes that failed to upload/upload to/from the remote segment store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         started:
           description: The number of bytes to upload/download to/from the remote segment store after the upload/download has started.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         started_bytes:
           description: The number of bytes to upload/download to/from the remote segment store after the upload/download has started.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         succeeded:
           description: The number of bytes successfully uploaded/downloaded to/from the remote segment store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         succeeded_bytes:
           description: The number of bytes successfully uploaded/downloaded to/from the remote segment store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - failed_bytes
         - started_bytes
@@ -1163,16 +1164,16 @@ components:
       properties:
         max:
           description: The maximum amount of lag, in bytes, during the upload refresh between the remote segment store and the local store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         max_bytes:
           description: The maximum amount of lag, in bytes, during the upload refresh between the remote segment store and the local store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         total:
           description: The total number of bytes that lagged during the upload refresh between the remote segment store and the local store.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         total_bytes:
           description: The total number of bytes that lagged during the upload refresh between the remote segment store and the local store.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - max_bytes
         - total_bytes
@@ -1196,11 +1197,11 @@ components:
       type: object
       properties:
         max_bytes_behind:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         max_replication_lag:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         total_bytes_behind:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - max_bytes_behind
         - max_replication_lag
@@ -1212,10 +1213,10 @@ components:
           description: Total number of segments across all shards assigned to selected nodes.
           type: number
         doc_values_memory:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         doc_values_memory_in_bytes:
           description: Total amount, in bytes, of memory used for doc values across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         file_sizes:
           description: |-
             This object is not populated by the cluster stats API.
@@ -1224,62 +1225,62 @@ components:
           additionalProperties:
             $ref: 'indices.stats.yaml#/components/schemas/ShardFileSizeInfo'
         fixed_bit_set:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         fixed_bit_set_memory_in_bytes:
           description: Total amount of memory, in bytes, used by fixed bit sets across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         index_writer_memory:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         index_writer_max_memory_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         index_writer_memory_in_bytes:
           description: Total amount, in bytes, of memory used by all index writers across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         max_unsafe_auto_id_timestamp:
           description: Unix timestamp, in milliseconds, of the most recently retried indexing request.
           type: number
         memory:
           description: Total amount, of memory used for segments across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         memory_in_bytes:
           description: Total amount, in bytes, of memory used for segments across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         norms_memory:
           description: Total amount of memory used for normalization factors across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         norms_memory_in_bytes:
           description: Total amount, in bytes, of memory used for normalization factors across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         points_memory:
           description: Total amount of memory used for points across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         points_memory_in_bytes:
           description: Total amount, in bytes, of memory used for points across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         stored_fields_memory:
           description: Total amount of memory used for stored fields across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         stored_fields_memory_in_bytes:
           description: Total amount, in bytes, of memory used for stored fields across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         terms_memory:
           description: Total amount of memory used for terms across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         terms_memory_in_bytes:
           description: Total amount, in bytes, of memory used for terms across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         term_vectors_memory:
           description: Total amount of memory used for term vectors across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         term_vectors_memory_in_bytes:
           description: Total amount, in bytes, of memory used for term vectors across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         version_map_memory:
           description: Total amount of memory used by all version maps across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         version_map_memory_in_bytes:
           description: Total amount, in bytes, of memory used by all version maps across all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         remote_store:
           $ref: '#/components/schemas/RemoteStoreStats'
         segment_replication:
@@ -1302,15 +1303,15 @@ components:
       type: object
       properties:
         size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
           description: Total size, in bytes, of all shards assigned to selected nodes.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         reserved:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         reserved_in_bytes:
           description: A prediction, in bytes, of how much larger the shard stores will eventually grow due to ongoing peer recoveries, restoring snapshots, and similar activities.
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - reserved_in_bytes
         - size_in_bytes
@@ -1624,21 +1625,21 @@ components:
         current_docs:
           type: number
         current_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         current_size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         total:
           type: number
         total_auto_throttle:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         total_auto_throttle_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         total_docs:
           type: number
         total_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         total_size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         total_stopped_time:
           $ref: '#/components/schemas/Duration'
         total_stopped_time_in_millis:
@@ -1710,9 +1711,9 @@ components:
         hit_count:
           type: number
         memory_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         memory_size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         miss_count:
           type: number
       required:
@@ -1833,15 +1834,15 @@ components:
         remote_store:
           $ref: '#/components/schemas/RemoteStoreTranslogStats'
         size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
         uncommitted_operations:
           type: number
         uncommitted_size:
-          $ref: '#/components/schemas/StorageSize'
+          $ref: '#/components/schemas/HumanReadableByteCount'
         uncommitted_size_in_bytes:
-          $ref: '#/components/schemas/Bytes'
+          $ref: '#/components/schemas/ByteCount'
       required:
         - earliest_last_modified_age
         - operations
diff --git a/spec/schemas/cat.segments.yaml b/spec/schemas/cat.segments.yaml
index 177c74e40..b0a119457 100644
--- a/spec/schemas/cat.segments.yaml
+++ b/spec/schemas/cat.segments.yaml
@@ -44,7 +44,7 @@ components:
             Also, OpenSearch creates extra deleted documents to internally track the recent history of operations on a shard.
           type: string
         size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         size.memory:
           type: string
         committed:
diff --git a/spec/schemas/cluster.allocation_explain.yaml b/spec/schemas/cluster.allocation_explain.yaml
index ec55c7cac..55d93622d 100644
--- a/spec/schemas/cluster.allocation_explain.yaml
+++ b/spec/schemas/cluster.allocation_explain.yaml
@@ -48,8 +48,8 @@ components:
           type: object
           additionalProperties:
             oneOf:
-              - $ref: '_common.yaml#/components/schemas/Bytes'
-              - $ref: '_common.yaml#/components/schemas/StorageSize'
+              - $ref: '_common.yaml#/components/schemas/ByteCount'
+              - $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         shard_data_set_sizes:
           type: object
           additionalProperties:
@@ -86,17 +86,17 @@ components:
         path:
           type: string
         total:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         used:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         used_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         free_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free_disk_percent:
           type: number
         used_disk_percent:
@@ -188,7 +188,7 @@ components:
         in_sync:
           type: boolean
         matching_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         matching_sync_id:
           type: boolean
         store_exception:
diff --git a/spec/schemas/cluster.stats.yaml b/spec/schemas/cluster.stats.yaml
index 62e43b54f..d1590c7f7 100644
--- a/spec/schemas/cluster.stats.yaml
+++ b/spec/schemas/cluster.stats.yaml
@@ -213,10 +213,10 @@ components:
           description: Total number of fields in all non-system indices, accounting for mapping deduplication.
           type: number
         total_deduplicated_mapping_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_deduplicated_mapping_size_in_bytes:
           description: Total size of all mappings, in bytes, after deduplication and compression.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - field_types
     RuntimeFieldTypes:
@@ -288,7 +288,7 @@ components:
         primary_shard_count:
           type: number
         total_primary_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         version:
           $ref: '_common.yaml#/components/schemas/VersionString'
       required:
@@ -401,32 +401,32 @@ components:
             Total number of bytes available to JVM in file stores across all selected nodes.
             Depending on operating system or process-level restrictions, this number may be less than `nodes.fs.free_in_byes`.
             This is the actual amount of free disk space the selected OpenSearch nodes can use.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         available_in_bytes:
           description: |-
             Total number of bytes available to JVM in file stores across all selected nodes.
             Depending on operating system or process-level restrictions, this number may be less than `nodes.fs.free_in_byes`.
             This is the actual amount of free disk space the selected OpenSearch nodes can use.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free:
           description: Total number of unallocated bytes in file stores across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         free_in_bytes:
           description: Total number of unallocated bytes in file stores across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total:
           description: Total size, of all file stores across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
           description: Total size, in bytes, of all file stores across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         cache_reserved:
           description: Total size, of all cache reserved across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
           x-version-added: '2.7'
         cache_reserved_in_bytes:
           description: Total size, in bytes, of all cache reserved across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
           x-version-added: '2.7'
       required:
         - available_in_bytes
@@ -445,7 +445,7 @@ components:
         current:
           $ref: '#/components/schemas/IndexingPressureMemorySummary'
         limit_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total:
           $ref: '#/components/schemas/IndexingPressureMemorySummary'
       required:
@@ -456,19 +456,19 @@ components:
       type: object
       properties:
         all_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         combined_coordinating_and_primary_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         coordinating_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         coordinating_rejections:
           type: number
         primary_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         primary_rejections:
           type: number
         replica_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         replica_rejections:
           type: number
       required:
@@ -534,16 +534,16 @@ components:
       properties:
         heap_max:
           description: Maximum amount of memory available for use by the heap across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_max_in_bytes:
           description: Maximum amount of memory, in bytes, available for use by the heap across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         heap_used:
           description: Memory currently in use by the heap across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_used_in_bytes:
           description: Memory, in bytes, currently in use by the heap across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - heap_max_in_bytes
         - heap_used_in_bytes
@@ -645,28 +645,28 @@ components:
       properties:
         adjusted_total_in_bytes:
           description: Total amount, in bytes, of memory across all selected nodes, but using the value specified using the `es.total_memory_bytes` system property instead of measured total memory for those nodes where that system property was set.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free:
           description: Amount, in bytes, of free physical memory across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         free_in_bytes:
           description: Amount, in bytes, of free physical memory across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free_percent:
           description: Percentage of free physical memory across all selected nodes.
           type: number
         total:
           description: Total amount of physical memory across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
           description: Total amount, in bytes, of physical memory across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         used:
           description: Amount of physical memory in use across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         used_in_bytes:
           description: Amount, in bytes, of physical memory in use across all selected nodes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         used_percent:
           description: Percentage of physical memory in use across all selected nodes.
           type: number
diff --git a/spec/schemas/indices._common.yaml b/spec/schemas/indices._common.yaml
index ea02f12f8..90d6776d6 100644
--- a/spec/schemas/indices._common.yaml
+++ b/spec/schemas/indices._common.yaml
@@ -382,7 +382,7 @@ components:
         durability:
           $ref: '#/components/schemas/TranslogDurability'
         flush_threshold_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         retention:
           $ref: '#/components/schemas/TranslogRetention'
     TranslogDurability:
@@ -394,7 +394,7 @@ components:
       type: object
       properties:
         size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         age:
           $ref: '_common.yaml#/components/schemas/Duration'
     SettingsQueryString:
@@ -787,13 +787,13 @@ components:
         max_docs:
           type: number
         min_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         min_primary_shard_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_primary_shard_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         min_primary_shard_docs:
           type: number
         max_primary_shard_docs:
diff --git a/spec/schemas/indices.data_streams_stats.yaml b/spec/schemas/indices.data_streams_stats.yaml
index aec96d68b..f8309bb2e 100644
--- a/spec/schemas/indices.data_streams_stats.yaml
+++ b/spec/schemas/indices.data_streams_stats.yaml
@@ -17,10 +17,10 @@ components:
         maximum_timestamp:
           $ref: '_common.yaml#/components/schemas/EpochTimeUnitMillis'
         store_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         store_size_bytes:
           description: Total size, in bytes, of all shards for the data stream's backing indices.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - backing_indices
         - data_stream
diff --git a/spec/schemas/indices.recovery.yaml b/spec/schemas/indices.recovery.yaml
index c0d455478..a4f6eaeec 100644
--- a/spec/schemas/indices.recovery.yaml
+++ b/spec/schemas/indices.recovery.yaml
@@ -95,21 +95,21 @@ components:
         percent:
           $ref: '_common.yaml#/components/schemas/Percentage'
         recovered:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         recovered_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         recovered_from_snapshot:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         recovered_from_snapshot_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         reused:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         reused_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - percent
         - recovered_in_bytes
diff --git a/spec/schemas/indices.rollover.yaml b/spec/schemas/indices.rollover.yaml
index 05e73c318..f78347fe4 100644
--- a/spec/schemas/indices.rollover.yaml
+++ b/spec/schemas/indices.rollover.yaml
@@ -20,21 +20,21 @@ components:
         max_docs:
           type: number
         max_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_size_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         min_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         min_size_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         max_primary_shard_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_primary_shard_size_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         min_primary_shard_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         min_primary_shard_size_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         max_primary_shard_docs:
           type: number
         min_primary_shard_docs:
diff --git a/spec/schemas/indices.segments.yaml b/spec/schemas/indices.segments.yaml
index c049e3ef6..ae2c62292 100644
--- a/spec/schemas/indices.segments.yaml
+++ b/spec/schemas/indices.segments.yaml
@@ -60,13 +60,13 @@ components:
         deleted_docs:
           type: integer
         size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         memory:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         memory_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         committed:
           type: boolean
         search:
diff --git a/spec/schemas/indices.stats.yaml b/spec/schemas/indices.stats.yaml
index 6a12537b2..b2391cddb 100644
--- a/spec/schemas/indices.stats.yaml
+++ b/spec/schemas/indices.stats.yaml
@@ -12,15 +12,15 @@ components:
         description:
           type: string
         size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         min_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         max_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         average_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         count:
           type: number
       required:
diff --git a/spec/schemas/nodes._common.yaml b/spec/schemas/nodes._common.yaml
index eb0c14f85..51fb8b7cf 100644
--- a/spec/schemas/nodes._common.yaml
+++ b/spec/schemas/nodes._common.yaml
@@ -56,7 +56,7 @@ components:
           type: number
         request_size_bytes:
           description: Cumulative size in bytes of all requests from this client.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         x_opaque_id:
           description: |-
             Value from the client's `x-opaque-id` HTTP header.
@@ -388,9 +388,9 @@ components:
       type: object
       properties:
         size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         evictions:
           type: number
         hit_count:
@@ -428,16 +428,16 @@ components:
       properties:
         estimated_size:
           description: Estimated memory used for the operation.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         estimated_size_in_bytes:
           description: Estimated memory used, in bytes, for the operation.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         limit_size:
           description: Memory limit for the circuit breaker.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         limit_size_in_bytes:
           description: Memory limit, in bytes, for the circuit breaker.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         overhead:
           description: A constant that all estimates for the circuit breaker are multiplied with to calculate a final estimate.
           type: number
@@ -466,38 +466,38 @@ components:
       properties:
         available:
           description: Total amount of disk space available to this Java virtual machine on this file store.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         available_in_bytes:
           description: Total number of bytes available to this Java virtual machine on this file store.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         cache_reserved:
           x-version-added: '2.7'
           description: Total number of cache bytes reserved available to this Java virtual machine on this file store.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         cache_reserved_in_bytes:
           x-version-added: '2.7'
           description: Total number of cache bytes reserved available to this Java virtual machine on this file store.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         disk_queue:
           type: string
         disk_reads:
           type: number
         disk_read_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         disk_read_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         disk_writes:
           type: number
         disk_write_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         disk_write_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free:
           description: Total amount of unallocated disk space in the file store.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         free_in_bytes:
           description: Total number of unallocated bytes in the file store.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         mount:
           description: 'Mount point of the file store (for example: `/dev/sda2`).'
           type: string
@@ -506,10 +506,10 @@ components:
           type: string
         total:
           description: Total size of the file store.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
           description: Total size of the file store in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         type:
           description: 'Type of the file store (ex: ext4).'
           type: string
@@ -521,33 +521,33 @@ components:
             Total disk space available to this Java virtual machine on all file stores.
             Depending on OS or process level restrictions, this might appear less than `free`.
             This is the actual amount of free disk space the OpenSearch node can utilize.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         available_in_bytes:
           description: |-
             Total number of bytes available to this Java virtual machine on all file stores.
             Depending on OS or process level restrictions, this might appear less than `free_in_bytes`.
             This is the actual amount of free disk space the OpenSearch node can utilize.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free:
           description: Total unallocated disk space in all file stores.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         free_in_bytes:
           description: Total number of unallocated bytes in all file stores.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total:
           description: Total size of all file stores.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
           description: Total size of all file stores in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         cache_reserved:
           x-version-added: '2.7'
           description: Total size of cache bytes reserved in all file stores.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         cache_reserved_in_bytes:
           x-version-added: '2.7'
           description: Total size of cache bytes reserved in all file stores.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
     IoStats:
       type: object
       properties:
@@ -624,16 +624,16 @@ components:
           type: number
         total_capacity:
           description: Total capacity of buffer pools.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_capacity_in_bytes:
           description: Total capacity of buffer pools in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         used:
           description: Size of buffer pools.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         used_in_bytes:
           description: Size of buffer pools in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
     JvmClasses:
       type: object
       properties:
@@ -671,37 +671,37 @@ components:
       properties:
         heap_used:
           description: Memory currently in use by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_used_in_bytes:
           description: Memory, in bytes, currently in use by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         heap_used_percent:
           description: Percentage of memory currently in use by the heap.
           type: number
         heap_committed:
           description: Amount of memory available for use by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_committed_in_bytes:
           description: Amount of memory, in bytes, available for use by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         heap_max:
           description: Maximum amount of memory available for use by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_max_in_bytes:
           description: Maximum amount of memory, in bytes, available for use by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         non_heap_used:
           description: Non-heap memory used.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         non_heap_used_in_bytes:
           description: Non-heap memory used, in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         non_heap_committed:
           description: Amount of non-heap memory available.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         non_heap_committed_in_bytes:
           description: Amount of non-heap memory available, in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         pools:
           description: Contains statistics about heap memory usage for the node.
           type: object
@@ -712,28 +712,28 @@ components:
       properties:
         used:
           description: Memory used by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         used_in_bytes:
           description: Memory, in bytes, used by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         max:
           description: Maximum amount of memory available for use by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_in_bytes:
           description: Maximum amount of memory, in bytes, available for use by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         peak_used:
           description: Largest amount of memory historically used by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         peak_used_in_bytes:
           description: Largest amount of memory, in bytes, historically used by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         peak_max:
           description: Largest amount of memory historically used by the heap.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         peak_max_in_bytes:
           description: Largest amount of memory, in bytes, historically used by the heap.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         last_gc_stats:
           description: Most recent GC cycle stats for a particular memory pool.
           $ref: '#/components/schemas/LastGcStats'
@@ -741,13 +741,13 @@ components:
       type: object
       properties:
         used:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         used_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         max:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         usage_percent:
           type: number
     JvmThreads:
@@ -811,37 +811,37 @@ components:
           description: |-
             If the amount of physical memory has been overridden using the `es`.`total_memory_bytes` system property then this reports the overridden value in bytes.
             Otherwise it reports the same value as `total_in_bytes`.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         resident:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         resident_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         share:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         share_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total_virtual:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_virtual_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total:
           description: Total amount of physical memory.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
           description: Total amount of physical memory in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         free:
           description: Amount of free physical memory.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         free_in_bytes:
           description: Amount of free physical memory in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         used:
           description: Amount of used physical memory.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         used_in_bytes:
           description: Amount of used physical memory in bytes.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
     Cgroup:
       type: object
       properties:
@@ -951,10 +951,10 @@ components:
           type: number
         rx_size:
           description: Size of RX packets received by the node during internal cluster communication.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         rx_size_in_bytes:
           description: Size, in bytes, of RX packets received by the node during internal cluster communication.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         server_open:
           description: Current number of inbound TCP connections used for internal communication between nodes.
           type: number
@@ -963,10 +963,10 @@ components:
           type: number
         tx_size:
           description: Size of TX packets sent by the node during internal cluster communication.
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         tx_size_in_bytes:
           description: Size, in bytes, of TX packets sent by the node during internal cluster communication.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         total_outbound_connections:
           description: |-
             The cumulative number of outbound transport connections that this node has opened since it started.
@@ -1096,13 +1096,13 @@ components:
         count:
           type: number
         uncompressed_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         uncompressed_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         compressed_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         compressed_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
     ClusterAppliedStats:
       type: object
       properties:
@@ -1179,17 +1179,17 @@ components:
         cancellation_count:
           type: number
         current_max:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         current_max_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         current_avg:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         current_avg_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         rolling_avg:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         rolling_avg_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
     ShardSearchBackpressureTaskResourceTrackerElapsedTimeTrackerStats:
       type: object
       properties:
@@ -1240,12 +1240,12 @@ components:
       type: object
       properties:
         limit:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         limit_in_bytes:
           description: |-
             Configured memory limit, in bytes, for the indexing requests.
             Replica requests have an automatic limit that is 1.5x this value.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         current:
           $ref: '#/components/schemas/PressureMemory'
         total:
@@ -1254,32 +1254,32 @@ components:
       type: object
       properties:
         all:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         all_in_bytes:
           description: Memory consumed, in bytes, by indexing requests in the coordinating, primary, or replica stage.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         combined_coordinating_and_primary:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         combined_coordinating_and_primary_in_bytes:
           description: |-
             Memory consumed, in bytes, by indexing requests in the coordinating or primary stage.
             This value is not the sum of coordinating and primary as a node can reuse the coordinating memory if the primary stage is executed locally.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         coordinating:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         coordinating_in_bytes:
           description: Memory consumed, in bytes, by indexing requests in the coordinating stage.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         primary:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         primary_in_bytes:
           description: Memory consumed, in bytes, by indexing requests in the primary stage.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         replica:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         replica_in_bytes:
           description: Memory consumed, in bytes, by indexing requests in the replica stage.
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         coordinating_rejections:
           description: Number of indexing requests rejected in the coordinating stage.
           type: number
diff --git a/spec/schemas/nodes.info.yaml b/spec/schemas/nodes.info.yaml
index 7102b54b9..2d27da447 100644
--- a/spec/schemas/nodes.info.yaml
+++ b/spec/schemas/nodes.info.yaml
@@ -82,7 +82,7 @@ components:
           description: Total heap allowed to be used to hold recently indexed documents before they must be written to disk. This size is a shared pool across all shards on this node, and is controlled by Indexing Buffer settings.
           type: number
         total_indexing_buffer_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         transport:
           $ref: '#/components/schemas/NodeInfoTransport'
         transport_address:
@@ -115,9 +115,9 @@ components:
           items:
             type: string
         max_content_length:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         max_content_length_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         publish_address:
           type: string
       required:
@@ -170,25 +170,25 @@ components:
       type: object
       properties:
         direct_max:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         direct_max_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         heap_init:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_init_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         heap_max:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         heap_max_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         non_heap_init:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         non_heap_init_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         non_heap_max:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         non_heap_max_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - direct_max_in_bytes
         - heap_init_in_bytes
@@ -251,9 +251,9 @@ components:
       type: object
       properties:
         cache_size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         cache_size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         cores_per_socket:
           type: number
         mhz:
@@ -279,9 +279,9 @@ components:
       type: object
       properties:
         total:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - total
         - total_in_bytes
diff --git a/spec/schemas/snapshot._common.yaml b/spec/schemas/snapshot._common.yaml
index f00611ec7..83c8a8d9c 100644
--- a/spec/schemas/snapshot._common.yaml
+++ b/spec/schemas/snapshot._common.yaml
@@ -89,9 +89,9 @@ components:
         shard_count:
           type: number
         size:
-          $ref: '_common.yaml#/components/schemas/StorageSize'
+          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
         max_segments_per_shard:
           type: number
       required:
@@ -228,7 +228,7 @@ components:
         file_count:
           type: number
         size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - file_count
         - size_in_bytes
@@ -278,7 +278,7 @@ components:
         file_count:
           type: number
         size_in_bytes:
-          $ref: '_common.yaml#/components/schemas/Bytes'
+          $ref: '_common.yaml#/components/schemas/ByteCount'
       required:
         - file_count
         - size_in_bytes