diff --git a/homeassistant/components/automation/geo_location.py b/homeassistant/components/automation/geo_location.py
index 537646fefc1..33ef00da380 100644
--- a/homeassistant/components/automation/geo_location.py
+++ b/homeassistant/components/automation/geo_location.py
@@ -1,9 +1,9 @@
 """
-Offer geo location automation rules.
+Offer geolocation automation rules.
 
 For more details about this automation trigger, please refer to the
 documentation at
-https://home-assistant.io/docs/automation/trigger/#geo-location-trigger
+https://home-assistant.io/docs/automation/trigger/#geolocation-trigger
 """
 import voluptuous as vol
 
diff --git a/homeassistant/components/geo_location/__init__.py b/homeassistant/components/geo_location/__init__.py
index 495c9e1744b..73a97d4666d 100644
--- a/homeassistant/components/geo_location/__init__.py
+++ b/homeassistant/components/geo_location/__init__.py
@@ -1,5 +1,5 @@
 """
-Geo Location component.
+Geolocation component.
 
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/geo_location/
@@ -22,13 +22,13 @@ DOMAIN = 'geo_location'
 
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
-GROUP_NAME_ALL_EVENTS = 'All Geo Location Events'
+GROUP_NAME_ALL_EVENTS = 'All Geolocation Events'
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
 
 async def async_setup(hass, config):
-    """Set up the Geo Location component."""
+    """Set up the Geolocation component."""
     component = EntityComponent(
         _LOGGER, DOMAIN, hass, SCAN_INTERVAL, GROUP_NAME_ALL_EVENTS)
     await component.async_setup(config)
@@ -36,7 +36,7 @@ async def async_setup(hass, config):
 
 
 class GeoLocationEvent(Entity):
-    """This represents an external event with an associated geo location."""
+    """This represents an external event with an associated geolocation."""
 
     @property
     def state(self):
diff --git a/homeassistant/components/geo_location/demo.py b/homeassistant/components/geo_location/demo.py
index 6c5cc2fe147..995cbeefa36 100644
--- a/homeassistant/components/geo_location/demo.py
+++ b/homeassistant/components/geo_location/demo.py
@@ -1,5 +1,5 @@
 """
-Demo platform for the geo location component.
+Demo platform for the geolocation component.
 
 For more details about this platform, please refer to the documentation
 https://home-assistant.io/components/demo/
@@ -30,15 +30,15 @@ SOURCE = 'demo'
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Demo geo locations."""
+    """Set up the Demo geolocations."""
     DemoManager(hass, add_entities)
 
 
 class DemoManager:
-    """Device manager for demo geo location events."""
+    """Device manager for demo geolocation events."""
 
     def __init__(self, hass, add_entities):
-        """Initialise the demo geo location event manager."""
+        """Initialise the demo geolocation event manager."""
         self._hass = hass
         self._add_entities = add_entities
         self._managed_devices = []
@@ -91,7 +91,7 @@ class DemoManager:
 
 
 class DemoGeoLocationEvent(GeoLocationEvent):
-    """This represents a demo geo location event."""
+    """This represents a demo geolocation event."""
 
     def __init__(self, name, distance, latitude, longitude,
                  unit_of_measurement):
@@ -114,7 +114,7 @@ class DemoGeoLocationEvent(GeoLocationEvent):
 
     @property
     def should_poll(self):
-        """No polling needed for a demo geo location event."""
+        """No polling needed for a demo geolocation event."""
         return False
 
     @property