diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index f061b54529e..abb7fb41210 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -61,7 +61,7 @@
           <li>{% active_link /getting-started/autostart-systemd/ Linux - systemd %}</li>
           <li>{% active_link /getting-started/autostart-upstart/ Linux - Upstart %}</li>
           <li>{% active_link /getting-started/autostart-init.d/ Linux - init.d %}</li>
-          <li>{% active_link /getting-started/autostart-macos/ OS X %}</li>
+          <li>{% active_link /getting-started/autostart-macos/ macOS %}</li>
           <li>{% active_link /getting-started/autostart-synology/ Synology NAS %}</li>
         </ul>
       </li>
diff --git a/source/getting-started/autostart.markdown b/source/getting-started/autostart.markdown
index 630a590c65c..34951c2c957 100644
--- a/source/getting-started/autostart.markdown
+++ b/source/getting-started/autostart.markdown
@@ -13,5 +13,5 @@ Once you get started with Home Assistant you want it to start automatically when
 
  - [Linux - systemd](/getting-started/autostart-systemd/)
  - [Linux - Upstart](/getting-started/autostart-upstart/)
- - [OS X](/getting-started/autostart-macos/)
+ - [macOS](/getting-started/autostart-macos/)
  - [Synology NAS](/getting-started/autostart-synology/)
diff --git a/source/getting-started/configuration.markdown b/source/getting-started/configuration.markdown
index 5561cb24ffb..ee68ebb88b2 100644
--- a/source/getting-started/configuration.markdown
+++ b/source/getting-started/configuration.markdown
@@ -15,7 +15,7 @@ The location of the folder differs between operating systems:
 
 | OS | Path |
 | -- | ---- |
-| OS X | `~/.homeassistant` |
+| macOS | `~/.homeassistant` |
 | Linux | `~/.homeassistant` |
 | Windows | `%APPDATA%/.homeassistant` |