diff --git a/doc/source/command-objects/aggregate.rst b/doc/source/command-objects/aggregate.rst
index 6a1dd9089e..c002704f8a 100644
--- a/doc/source/command-objects/aggregate.rst
+++ b/doc/source/command-objects/aggregate.rst
@@ -2,7 +2,7 @@
 aggregate
 =========
 
-Server aggregates provide a mechanism to group servers according to certain
+Host aggregates provide a mechanism to group hosts according to certain
 criteria.
 
 Compute v2
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index c54cadb1b9..d7f2d3c759 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -71,7 +71,7 @@ referring to both Compute and Volume quotas.
 
 * ``access token``: (**Identity**) long-lived OAuth-based token
 * ``availability zone``: (**Compute**, **Network**, **Volume**) a logical partition of hosts or block storage or network services
-* ``aggregate``: (**Compute**) a grouping of servers
+* ``aggregate``: (**Compute**) a grouping of compute hosts
 * ``backup``: (**Volume**) a volume copy
 * ``catalog``: (**Identity**) service catalog
 * ``command``: (**Internal**) installed commands in the OSC process