diff --git a/source/_includes/asides/component_navigation.html b/source/_includes/asides/component_navigation.html
index dddc682c23d..c6806297017 100644
--- a/source/_includes/asides/component_navigation.html
+++ b/source/_includes/asides/component_navigation.html
@@ -43,7 +43,7 @@
 
   {%- if page.ha_config_flow -%}
     <div class='section'>
-      This component is configurable via UI
+      This integration is configurable via UI
     </div>
   {%- endif -%}
 
diff --git a/source/_includes/custom/navigation.html b/source/_includes/custom/navigation.html
index 6af93d4b49e..62da4e0523c 100644
--- a/source/_includes/custom/navigation.html
+++ b/source/_includes/custom/navigation.html
@@ -10,7 +10,7 @@
     </li>
   {% endcomment %}
   <li><a href="/getting-started/">Getting started</a></li>
-  <li><a href="/components/">Components</a></li>
+  <li><a href="/components/">Integrations</a></li>
   <li><a href="/docs/">Docs</a></li>
   <li><a href="/cookbook/">Examples</a></li>
   <li><a href="/blog/">Blog</a></li>
diff --git a/source/components/index.html b/source/components/index.html
index 6278af8d5f4..d817a2c2adb 100644
--- a/source/components/index.html
+++ b/source/components/index.html
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Components"
+title: "Integrations"
 description: "List of the built-in components of Home Assistant."
 date: 2014-12-21 13:35
 sidebar: false
@@ -30,7 +30,7 @@ regenerate: false
 {%- assign categories = components | map: 'ha_category' | join: ',' | join: ',' | split: ',' | uniq | sort -%}
 
 <p class='note'>
-Support for these components is provided by the Home Assistant community.
+Support for these integrations is provided by the Home Assistant community.
 </p>
 <div class="grid">
   <div class="grid__item one-sixth lap-one-whole palm-one-whole">
@@ -61,7 +61,7 @@ Support for these components is provided by the Home Assistant community.
   <div class="grid__item five-sixths lap-one-whole palm-one-whole">
     <div class="component-search">
       <form onsubmit="event.preventDefault(); return false">
-        <input type="text" name="search" id="search" class="search" placeholder="Search components..." autofocus />
+        <input type="text" name="search" id="search" class="search" placeholder="Search integrations..." autofocus />
       </form>
     </div>
     <div class="hass-option-cards" id="componentContainer"> </div>