diff --git a/source/_data/glossary.yml b/source/_data/glossary.yml
index f658f95868f..bef18fe2b88 100644
--- a/source/_data/glossary.yml
+++ b/source/_data/glossary.yml
@@ -72,6 +72,8 @@
     Conditions are an optional part of an automation that will prevent an
     action from firing if they are not met.
   link: /docs/scripts/conditions/
+  aliases:
+    - conditions
 
 - term: Cover
   definition: >-
@@ -335,8 +337,9 @@
     A service carries out one specific task, for example: turn on the light in the 
     living room. A service has targets and data and can be called by actions, a 
     dashboard, or via voice command.
-
   link: /docs/scripts/service-calls/
+  aliases:
+    - services
 
 - term: State
   definition: |-
diff --git a/source/_integrations/input_boolean.markdown b/source/_integrations/input_boolean.markdown
index 3aa88a2b5d2..c5bf4bb55da 100644
--- a/source/_integrations/input_boolean.markdown
+++ b/source/_integrations/input_boolean.markdown
@@ -14,14 +14,14 @@ ha_integration_type: helper
 
 The Input Boolean helper integration allows you to define boolean values that
 can be controlled via the user interface and can be used within conditions of
-an automation. This can for example be used to disable or enable certain
-automations by using them in their conditions.
+an {% term automation %}. This can for example be used to disable or enable certain
+automations by using them in their {% term conditions %}.
 
 ## Configuration
 
 The preferred way to configure input boolean helpers is via the user interface,
 in which they are known as Toggle Helpers. To add one, go to
-**{% my helpers title="Settings -> Devices & Services -> Helpers" %}** and click the add button;
+**{% my helpers title="Settings > Devices & Services > Helpers" %}** and click the add button;
 next choose the **{% my config_flow_start domain=input_boolean title="Toggle" %}** option.
 
 To be able to add **Helpers** via the user interface you should have
@@ -32,14 +32,6 @@ then you can use the UI.
 
 Input booleans can also be configured via `configuration.yaml`:
 
-```yaml
-# Example configuration.yaml entry
-input_boolean:
-  notify_home:
-    name: Notify when someone arrives home
-    icon: mdi:car
-```
-
 {% configuration %}
   input_boolean:
     description: Alias for the input. Multiple entries are allowed.
@@ -61,9 +53,17 @@ input_boolean:
         type: icon
 {% endconfiguration %}
 
+```yaml
+# Example configuration.yaml entry
+input_boolean:
+  notify_home:
+    name: Notify when someone arrives home
+    icon: mdi:car
+```
+
 ## Services
 
-This integration provides the following services to modify the state of the
+This integration provides the following {% term services %} to modify the state of the
 `input_boolean` and a service to reload the configuration without restarting
 Home Assistant itself.
 
@@ -105,7 +105,7 @@ automation:
 
 You can also set or change the status of an `input_boolean` by using
 `input_boolean.turn_on`, `input_boolean.turn_off` or `input_boolean.toggle` in
-your automations.
+your automation action.
 
 ```yaml
 service: input_boolean.turn_on