diff --git a/atom.xml b/atom.xml
index 54ece755a7..d33a8adcab 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index dd8afab5b4..f6884dccd1 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index c8828b3a57..3befa45e40 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index cc0fcae24a..183999142b 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 2ebaf75373..dd37d7a566 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 0d3ad1a1a8..8986b51adb 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 11276c378f..926ee1c999 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml
index 30138a500d..1e31425ada 100644
--- a/blog/categories/iot-data/atom.xml
+++ b/blog/categories/iot-data/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: IoT-Data | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/iot-data/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml
index 5335c70afb..568148c768 100644
--- a/blog/categories/micropython/atom.xml
+++ b/blog/categories/micropython/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Micropython | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/micropython/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index a2aa68897a..9ab85077e8 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 9f653ec232..f17cfcd154 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 1a9c0dfbf6..dd9327cc44 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index a1154569e7..a57faaf9f6 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index adc1c7382b..d343a16414 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 7313341cdc..29681682b5 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index fe449278a2..ae1c82a21c 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 7c82eff264..4fc043d89a 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 5f67eedecf..ad57dece44 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index ddcd05b720..c2225a5c03 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index 57b3070a8c..6226e8d457 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 8eb25cd872..d3cb0e7dc6 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-09-22T06:07:48+00:00</updated>
+  <updated>2016-09-22T15:29:58+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/device_tracker.actiontec/index.html b/components/device_tracker.actiontec/index.html
index 9c3de3f6f1..80af8de123 100644
--- a/components/device_tracker.actiontec/index.html
+++ b/components/device_tracker.actiontec/index.html
@@ -186,7 +186,7 @@ This device tracker needs telnet to be enabled on the router.
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.aruba/index.html b/components/device_tracker.aruba/index.html
index 4214c67367..4e513efa64 100644
--- a/components/device_tracker.aruba/index.html
+++ b/components/device_tracker.aruba/index.html
@@ -189,7 +189,7 @@ This device tracker needs telnet to be enabled on the router.
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.asuswrt/index.html b/components/device_tracker.asuswrt/index.html
index b9a1275c57..2a9e885051 100644
--- a/components/device_tracker.asuswrt/index.html
+++ b/components/device_tracker.asuswrt/index.html
@@ -187,7 +187,7 @@ You need to enable telnet on your router if you choose to use <code class="highl
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.automatic/index.html b/components/device_tracker.automatic/index.html
index 4a5fc02533..be34afb069 100644
--- a/components/device_tracker.automatic/index.html
+++ b/components/device_tracker.automatic/index.html
@@ -184,7 +184,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.bluetooth_le_tracker/index.html b/components/device_tracker.bluetooth_le_tracker/index.html
index 040341a5e3..5e3fad1c4b 100644
--- a/components/device_tracker.bluetooth_le_tracker/index.html
+++ b/components/device_tracker.bluetooth_le_tracker/index.html
@@ -179,7 +179,7 @@ Some BTLE devices (e.g. fitness trackers) are only visible to the devices that t
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.bluetooth_tracker/index.html b/components/device_tracker.bluetooth_tracker/index.html
index dbdc5f188b..b21a52f296 100644
--- a/components/device_tracker.bluetooth_tracker/index.html
+++ b/components/device_tracker.bluetooth_tracker/index.html
@@ -172,7 +172,7 @@ Devices discovered are stored with ‘bt_’ as the prefix for device mac addres
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.bt_home_hub_5/index.html b/components/device_tracker.bt_home_hub_5/index.html
index 2cf64c15fb..06119bf5df 100644
--- a/components/device_tracker.bt_home_hub_5/index.html
+++ b/components/device_tracker.bt_home_hub_5/index.html
@@ -174,7 +174,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.ddwrt/index.html b/components/device_tracker.ddwrt/index.html
index 0b8b44ab21..70f28908f4 100644
--- a/components/device_tracker.ddwrt/index.html
+++ b/components/device_tracker.ddwrt/index.html
@@ -178,7 +178,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.fritz/index.html b/components/device_tracker.fritz/index.html
index fd5c5a9416..a1a2e98bbc 100644
--- a/components/device_tracker.fritz/index.html
+++ b/components/device_tracker.fritz/index.html
@@ -187,7 +187,7 @@ It seems that it is not necessary to use it in current generation Fritz!Box rout
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.icloud/index.html b/components/device_tracker.icloud/index.html
index 11385b6de8..ea0f3e66ad 100644
--- a/components/device_tracker.icloud/index.html
+++ b/components/device_tracker.icloud/index.html
@@ -189,7 +189,7 @@ If you have two-factor authentication enabled on your iCloud account you will no
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.locative/index.html b/components/device_tracker.locative/index.html
index 110bc512b0..c7af90b2a5 100644
--- a/components/device_tracker.locative/index.html
+++ b/components/device_tracker.locative/index.html
@@ -179,7 +179,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.luci/index.html b/components/device_tracker.luci/index.html
index 5c4db33d4a..3dfba6fda8 100644
--- a/components/device_tracker.luci/index.html
+++ b/components/device_tracker.luci/index.html
@@ -188,7 +188,7 @@ Some installations have <a href="https://github.com/openwrt/luci/issues/576">a s
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             OpenWRT (luci)
diff --git a/components/device_tracker.mqtt/index.html b/components/device_tracker.mqtt/index.html
index 7d5099716d..92d591abdd 100644
--- a/components/device_tracker.mqtt/index.html
+++ b/components/device_tracker.mqtt/index.html
@@ -223,7 +223,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.netgear/index.html b/components/device_tracker.netgear/index.html
index 736bcc1349..a4442b93dc 100644
--- a/components/device_tracker.netgear/index.html
+++ b/components/device_tracker.netgear/index.html
@@ -183,7 +183,7 @@
             Netgear
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.nmap_scanner/index.html b/components/device_tracker.nmap_tracker/index.html
similarity index 98%
rename from components/device_tracker.nmap_scanner/index.html
rename to components/device_tracker.nmap_tracker/index.html
index 0d9a6d5dbf..e17668e51e 100644
--- a/components/device_tracker.nmap_scanner/index.html
+++ b/components/device_tracker.nmap_tracker/index.html
@@ -12,12 +12,12 @@
     <meta name="description" content="Instructions how to integrate Nmap into Home Assistant.">
     
     <meta name="viewport" content="width=device-width">
-    <link rel="canonical" href="https://home-assistant.io/components/device_tracker.nmap_scanner/">
+    <link rel="canonical" href="https://home-assistant.io/components/device_tracker.nmap_tracker/">
 
     <meta property="fb:app_id" content="338291289691179">
     <meta property="og:title" content="Nmap">
     <meta property="og:site_name" content="Home Assistant">
-    <meta property="og:url" content="https://home-assistant.io/components/device_tracker.nmap_scanner/">
+    <meta property="og:url" content="https://home-assistant.io/components/device_tracker.nmap_tracker/">
     <meta property="og:type" content="article">
     <meta property="og:description" content="Instructions how to integrate Nmap into Home Assistant.">
     <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
@@ -124,7 +124,7 @@
   
   
     <section class="aside-module grid__item one-whole lap-one-half">
-  <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/device_tracker.nmap_scanner.markdown'>Edit this page on GitHub</a></div>
+  <div class='edit-github'><a href='https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/device_tracker.nmap_tracker.markdown'>Edit this page on GitHub</a></div>
   <div class='brand-logo-container section'>
       <img src='/images/supported_brands/nmap.png' />
   </div>
diff --git a/components/device_tracker.owntracks/index.html b/components/device_tracker.owntracks/index.html
index 2c6cefe0d0..3729891a13 100644
--- a/components/device_tracker.owntracks/index.html
+++ b/components/device_tracker.owntracks/index.html
@@ -221,7 +221,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.snmp/index.html b/components/device_tracker.snmp/index.html
index 88defb78d1..41c2073c85 100644
--- a/components/device_tracker.snmp/index.html
+++ b/components/device_tracker.snmp/index.html
@@ -199,7 +199,7 @@ This device tracker needs SNMP to be enabled on the router.
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.thomson/index.html b/components/device_tracker.thomson/index.html
index 3c422f49dc..1fd6ee1763 100644
--- a/components/device_tracker.thomson/index.html
+++ b/components/device_tracker.thomson/index.html
@@ -177,7 +177,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.tomato/index.html b/components/device_tracker.tomato/index.html
index addddcb983..b375e65e7b 100644
--- a/components/device_tracker.tomato/index.html
+++ b/components/device_tracker.tomato/index.html
@@ -179,7 +179,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.tplink/index.html b/components/device_tracker.tplink/index.html
index b784f902c5..e7dc246202 100644
--- a/components/device_tracker.tplink/index.html
+++ b/components/device_tracker.tplink/index.html
@@ -195,7 +195,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.ubus/index.html b/components/device_tracker.ubus/index.html
index 821d30aac8..5db1f7276d 100644
--- a/components/device_tracker.ubus/index.html
+++ b/components/device_tracker.ubus/index.html
@@ -216,7 +216,7 @@ file
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker.unifi/index.html b/components/device_tracker.unifi/index.html
index 7961927f6e..5345550060 100644
--- a/components/device_tracker.unifi/index.html
+++ b/components/device_tracker.unifi/index.html
@@ -182,7 +182,7 @@
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/components/device_tracker/index.html b/components/device_tracker/index.html
index 8fff41bc59..adcb0fabca 100644
--- a/components/device_tracker/index.html
+++ b/components/device_tracker/index.html
@@ -248,7 +248,7 @@
           <li><a href='/components/device_tracker.netgear/'>
             Netgear
           </a></li>
-          <li><a href='/components/device_tracker.nmap_scanner/'>
+          <li><a href='/components/device_tracker.nmap_tracker/'>
             Nmap
           </a></li>
           <li><a href='/components/device_tracker.luci/'>
diff --git a/components/index.html b/components/index.html
index 4d2e21e4a9..032366491a 100644
--- a/components/index.html
+++ b/components/index.html
@@ -3168,7 +3168,7 @@ Support for these components is provided by the Home Assistant community.
       
     
       
-        <a href='/components/device_tracker.nmap_scanner/'
+        <a href='/components/device_tracker.nmap_tracker/'
            class='presence-detection'
            style='display: none'>
           <div class='img-container'>
diff --git a/components/sensor.mqtt_room/index.html b/components/sensor.mqtt_room/index.html
index 78ae60b836..f201f89b55 100644
--- a/components/sensor.mqtt_room/index.html
+++ b/components/sensor.mqtt_room/index.html
@@ -197,7 +197,7 @@ Instead of developing your own application, you can also use any of these alread
             <a href='/components/device_tracker.netgear/'>Netgear</a>
         </li>
         <li>
-            <a href='/components/device_tracker.nmap_scanner/'>Nmap</a>
+            <a href='/components/device_tracker.nmap_tracker/'>Nmap</a>
         </li>
         <li>
             <a href='/components/device_tracker.luci/'>OpenWRT (luci)</a>
diff --git a/sitemap.xml b/sitemap.xml
index 7f0c7ebd65..6d31885fb2 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -747,7 +747,7 @@
 <loc>https://home-assistant.io/components/device_tracker.netgear/</loc>
 </url>
 <url>
-<loc>https://home-assistant.io/components/device_tracker.nmap_scanner/</loc>
+<loc>https://home-assistant.io/components/device_tracker.nmap_tracker/</loc>
 </url>
 <url>
 <loc>https://home-assistant.io/components/device_tracker.tomato/</loc>
@@ -2014,62 +2014,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2016-09-22T06:06:56+00:00</lastmod>
+<lastmod>2016-09-22T15:28:14+00:00</lastmod>
 </url>
 </urlset>