diff --git a/_data/nav.yml b/_data/nav.yml
index 83ca134f7f..79f532a8b1 100644
--- a/_data/nav.yml
+++ b/_data/nav.yml
@@ -58,7 +58,7 @@
- title: Close icon
- title: Colors
- title: Display
- - title: Flexbox
+ - title: Flex
- title: Image replacement
- title: Position
- title: Responsive helpers
diff --git a/docs/4.0/components/forms.md b/docs/4.0/components/forms.md
index 196ba4a8b0..1ae5c81f3b 100644
--- a/docs/4.0/components/forms.md
+++ b/docs/4.0/components/forms.md
@@ -534,7 +534,7 @@ And of course [custom form controls](#custom-forms) are supported.
Use the `.form-inline` class to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms vary slightly from their default states.
-- Controls are `display: flex`, collapsing any HTML white space and allowing you to provide alignment control with [spacing]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/spacing/) and [flexbox]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flexbox/) utilities.
+- Controls are `display: flex`, collapsing any HTML white space and allowing you to provide alignment control with [spacing]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/spacing/) and [flexbox]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flex/) utilities.
- Controls and input groups receive `width: auto` to override the Bootstrap default `width: 100%`.
- Controls **only appear inline in viewports that are at least 576px wide** to account for narrow viewports on mobile devices.
diff --git a/docs/4.0/components/list-group.md b/docs/4.0/components/list-group.md
index 66d76a77dd..da23ceba6f 100644
--- a/docs/4.0/components/list-group.md
+++ b/docs/4.0/components/list-group.md
@@ -109,7 +109,7 @@ Contextual classes also work with `.list-group-item-action`. Note the addition o
## With badges
-Add badges to any list group item to show unread counts, activity, and more with the help of some [utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flexbox/).
+Add badges to any list group item to show unread counts, activity, and more with the help of some [utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flex/).
{% example html %}
@@ -130,7 +130,7 @@ Add badges to any list group item to show unread counts, activity, and more with
## Custom content
-Add nearly any HTML within, even for linked list groups like the one below, with the help of [flexbox utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flexbox/).
+Add nearly any HTML within, even for linked list groups like the one below, with the help of [flexbox utilities]({{ site.baseurl }}/docs/{{ site.docs_version }}/utilities/flex/).
{% example html %}
diff --git a/docs/4.0/components/navs.md b/docs/4.0/components/navs.md
index 50526e883c..845024c3d0 100644
--- a/docs/4.0/components/navs.md
+++ b/docs/4.0/components/navs.md
@@ -220,7 +220,7 @@ Similar to the `.nav-fill` example using a `