diff --git a/docs/configuration/v1-guarantees.md b/docs/configuration/v1-guarantees.md
index 8825b19e2a9..1bbcc4cf1d2 100644
--- a/docs/configuration/v1-guarantees.md
+++ b/docs/configuration/v1-guarantees.md
@@ -27,8 +27,6 @@ Cortex strives to be 100% API compatible with Prometheus (under `/prometheus/*`
 - Additional API around pushing metrics (under `/api/push`).
 - Additional API endpoints for management of Cortex itself, such as the ring.  These APIs are not part of the any compatibility guarantees.
 
-_For more information, please refer to the [limitations](../guides/limitations.md) doc._
-
 ## Experimental features
 
 Cortex is an actively developed project and we want to encourage the introduction of new features and capability.  As such, not everything in each release of Cortex is considered "production-ready". We don't provide any backwards compatibility guarantees on these and the config and flags might break.
diff --git a/docs/guides/authentication-and-authorisation.md b/docs/guides/authentication-and-authorisation.md
index e5affdaf3f1..67d6c244b27 100644
--- a/docs/guides/authentication-and-authorisation.md
+++ b/docs/guides/authentication-and-authorisation.md
@@ -37,7 +37,7 @@ Note that the tenant ID that is used to write the series to the datastore
 should be the same as the one you use to query the data. If they don't match,
 you won't see any data. As of now, you can't see series from other tenants.
 
-For more information regarding the tenant ID limits, refer to: [Tenant ID limitations](./limitations.md#tenant-id-naming)
+For more information regarding the tenant ID naming conventions, refer to: [Tenant ID naming conventions](tenantID-naming-conventions.md#tenant-id-naming)
 
 ### Cortex-Tenant
 
diff --git a/docs/guides/glossary.md b/docs/guides/glossary.md
index 62af54dfda1..ad4663adaa8 100644
--- a/docs/guides/glossary.md
+++ b/docs/guides/glossary.md
@@ -82,7 +82,7 @@ A tenant (also called "user" or "org") is the owner of a set of series written t
 For more information, please refer to:
 
 - [HTTP API authentication](../api/_index.md#authentication)
-- [Tenant ID limitations](./limitations.md#tenant-id-naming)
+- [Tenant ID naming conventions](tenantID-naming-conventions.md#tenant-id-naming)
 
 ### Time series
 
diff --git a/docs/guides/limitations.md b/docs/guides/tenantID-naming-conventions.md
similarity index 83%
rename from docs/guides/limitations.md
rename to docs/guides/tenantID-naming-conventions.md
index 6f9be53da84..5fb91d7bcec 100644
--- a/docs/guides/limitations.md
+++ b/docs/guides/tenantID-naming-conventions.md
@@ -1,16 +1,17 @@
 ---
-title: "Limitations"
-linkTitle: "Limitations"
+title: "Tenant ID Naming Conventions"
+linkTitle: "Tenant ID Naming Conventions"
 weight: 998
-slug: limitations
+slug: Tenant ID Naming Conventions
 ---
 
 ## Tenant ID naming
 
-The tenant ID (also called "user ID" or "org ID") is the unique identifier of a tenant within a Cortex cluster. The tenant ID is opaque information to Cortex, which doesn't make any assumptions on its format/content, but its naming has two limitations:
+The tenant ID (also called "user ID" or "org ID") is the unique identifier of a tenant within a Cortex cluster. The tenant ID is opaque information to Cortex, which doesn't make any assumptions on its format/content, but its naming has three limitations:
 
 1. Supported characters
-2. Length
+2. Invalid tenant IDs
+3. Length
 
 ### Supported characters