diff --git a/atom.xml b/atom.xml
index dd2a36ca22..5dc4e48849 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 df290bd063..c3296d0472 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 d96ca4fc97..daa5da6c42 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 b533ce93b2..c3c34e05c6 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 7241288591..3bcb36b525 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 3fb4930ba5..333a716ca1 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 7ebe3e435e..5bdb2142eb 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 d8b6a6492e..55e7c6c1db 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 74437629c3..c3e1e6d040 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 5b8cc3a821..d23dcd2368 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 b6a0085b53..db4a7d900a 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 2ea3bb92f3..a5af4d5a04 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 b408d9f82f..7349b1bc1e 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 a1dbf5879d..062d977ec2 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 2d20fffbfa..5a1bff8e9a 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 43c9979b5f..c8583e9678 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 c1d7476012..74a141003f 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 0672bdb7bf..32bfb941b5 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 82fb768441..f3ef4d2ea8 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 ed9a32b5f5..d193db5d83 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+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 ee0dc23ae8..6fb3a17fa2 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-12-04T08:05:22+00:00</updated>
+  <updated>2016-12-04T12:08:29+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/camera.amcrest/index.html b/components/camera.amcrest/index.html
index 59658b4bbb..32b8ac6413 100644
--- a/components/camera.amcrest/index.html
+++ b/components/camera.amcrest/index.html
@@ -7,26 +7,26 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Amcrest Camera - Home Assistant</title>
+    <title>Amcrest IP Camera - Home Assistant</title>
     <meta name="author" content="Home Assistant">
-    <meta name="description" content="Instructions how to integrate Amcrest camera into Home Assistant.">
+    <meta name="description" content="Instructions how to integrate Amcrest IP cameras within Home Assistant.">
     
     <meta name="viewport" content="width=device-width">
     <link rel="canonical" href="https://home-assistant.io/components/camera.amcrest/">
 
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Amcrest Camera">
+    <meta property="og:title" content="Amcrest IP Camera">
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/components/camera.amcrest/">
     <meta property="og:type" content="article">
-    <meta property="og:description" content="Instructions how to integrate Amcrest camera into Home Assistant.">
+    <meta property="og:description" content="Instructions how to integrate Amcrest IP cameras within Home Assistant.">
     <meta property="og:image" content="https://home-assistant.io/images/default-social.png">
     
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="@home_assistant">
     
-    <meta name="twitter:title" content="Amcrest Camera">
-    <meta name="twitter:description" content="Instructions how to integrate Amcrest camera into Home Assistant.">
+    <meta name="twitter:title" content="Amcrest IP Camera">
+    <meta name="twitter:description" content="Instructions how to integrate Amcrest IP cameras within Home Assistant.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
 
     <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet">
@@ -84,15 +84,15 @@
   
   <header>
     <h1 class="title indent">
-      Amcrest Camera
+      Amcrest IP Camera
     </h1>
   </header>
   <hr class="divider">
   
 
-  <p>The <code class="highlighter-rouge">amcrest</code> platform allows you to watch the live stream of your <a href="https://amcrest.com/">Amcrest</a> IP camera in Home Assistant.</p>
+  <p>The <code class="highlighter-rouge">amcrest</code> platform allows you to integrate your <a href="https://amcrest.com/">Amcrest</a> IP camera in Home Assistant.</p>
 
-<p>To enable your Amcrest camera in your installation, add the following to your <code class="highlighter-rouge">configuration.yaml</code> file:</p>
+<p>To enable your camera in your installation, add the following to your <code class="highlighter-rouge">configuration.yaml</code> file:</p>
 
 <div class="language-yaml highlighter-rouge"><pre class="highlight"><code><span class="c1"># Example configuration.yaml entry</span>
 <span class="s">camera</span><span class="pi">:</span>
@@ -106,14 +106,15 @@
 <p>Configuration variables:</p>
 
 <ul>
-  <li><strong>host</strong> (<em>Required</em>): The IP address your camera.</li>
-  <li><strong>port</strong> (<em>Optional</em>): The port that the camera is running on. The default is 80.</li>
+  <li><strong>host</strong> (<em>Required</em>): The IP address or hostname of your camera. If using hostname, make sure the DNS works as expected.</li>
   <li><strong>username</strong> (<em>Required</em>): The username for accessing your camera.</li>
   <li><strong>password</strong> (<em>Required</em>): The password for accessing your camera.</li>
-  <li><strong>name</strong> (<em>Optional</em>): This parameter allows you to override the name of your camera.</li>
+  <li><strong>name</strong> (<em>Optional</em>): This parameter allows you to override the name of your camera. The default is “Amcrest Camera”.</li>
+  <li><strong>port</strong> (<em>Optional</em>): The port that the camera is running on. The default is 80.</li>
 </ul>
 
 
+
 </article>
 
 
@@ -140,7 +141,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            Amcrest Camera
+            Amcrest IP Camera
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.bloomsky/index.html b/components/camera.bloomsky/index.html
index aaba8a8e34..13504e1f7a 100644
--- a/components/camera.bloomsky/index.html
+++ b/components/camera.bloomsky/index.html
@@ -141,7 +141,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             BloomSky Camera
diff --git a/components/camera.ffmpeg/index.html b/components/camera.ffmpeg/index.html
index 67ec0a9305..7d5b0e235a 100644
--- a/components/camera.ffmpeg/index.html
+++ b/components/camera.ffmpeg/index.html
@@ -153,7 +153,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.foscam/index.html b/components/camera.foscam/index.html
index a5ce418577..e0a02ba08b 100644
--- a/components/camera.foscam/index.html
+++ b/components/camera.foscam/index.html
@@ -144,7 +144,7 @@ There seems to be some issues within Foscam with lengthy passwords and passwords
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.generic/index.html b/components/camera.generic/index.html
index 006c39c729..9074cde8a0 100644
--- a/components/camera.generic/index.html
+++ b/components/camera.generic/index.html
@@ -152,7 +152,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.local_file/index.html b/components/camera.local_file/index.html
index bf185a163d..606ff8364c 100644
--- a/components/camera.local_file/index.html
+++ b/components/camera.local_file/index.html
@@ -145,7 +145,7 @@ The given <code class="highlighter-rouge">file_path</code> must be an existing f
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.mjpeg/index.html b/components/camera.mjpeg/index.html
index 775f6c770c..037c8db82d 100644
--- a/components/camera.mjpeg/index.html
+++ b/components/camera.mjpeg/index.html
@@ -144,7 +144,7 @@ There is a <a href="https://github.com/shazow/urllib3/issues/800" target="_blank
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.nest/index.html b/components/camera.nest/index.html
index 626b8d2732..5fee6580be 100644
--- a/components/camera.nest/index.html
+++ b/components/camera.nest/index.html
@@ -151,7 +151,7 @@ You must have the <a href="/components/nest/">Nest component</a> configured to u
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.netatmo/index.html b/components/camera.netatmo/index.html
index 9daf3a9756..6c437972c9 100644
--- a/components/camera.netatmo/index.html
+++ b/components/camera.netatmo/index.html
@@ -173,7 +173,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.rpi_camera/index.html b/components/camera.rpi_camera/index.html
index 28771d0d7c..d83985fea6 100644
--- a/components/camera.rpi_camera/index.html
+++ b/components/camera.rpi_camera/index.html
@@ -147,7 +147,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.synology/index.html b/components/camera.synology/index.html
index ce1a8fa59d..02352ae9e1 100644
--- a/components/camera.synology/index.html
+++ b/components/camera.synology/index.html
@@ -157,7 +157,7 @@ Most users will need to set <code class="highlighter-rouge">valid_ssl</code> to
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.uvc/index.html b/components/camera.uvc/index.html
index 3ea64b4a21..a0fac00612 100644
--- a/components/camera.uvc/index.html
+++ b/components/camera.uvc/index.html
@@ -138,7 +138,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera.verisure/index.html b/components/camera.verisure/index.html
index 5d3156a89b..309df4ff3c 100644
--- a/components/camera.verisure/index.html
+++ b/components/camera.verisure/index.html
@@ -142,7 +142,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/camera/index.html b/components/camera/index.html
index c98b44ac7d..a361390c51 100644
--- a/components/camera/index.html
+++ b/components/camera/index.html
@@ -111,7 +111,7 @@
             <h1 class='title delta'>Platforms</h1>
             <ul class='divided'>
           <li><a href='/components/camera.amcrest/'>
-            Amcrest Camera
+            Amcrest IP Camera
           </a></li>
           <li><a href='/components/camera.bloomsky/'>
             BloomSky Camera
diff --git a/components/ifttt.manything/index.html b/components/ifttt.manything/index.html
index 5944f71611..f7d6641bae 100644
--- a/components/ifttt.manything/index.html
+++ b/components/ifttt.manything/index.html
@@ -194,7 +194,7 @@ For ManyThing support, you need to set up an <code class="highlighter-rouge">on<
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/components/index.html b/components/index.html
index 3e8f27b4be..de1c770f0e 100644
--- a/components/index.html
+++ b/components/index.html
@@ -601,7 +601,7 @@ Support for these components is provided by the Home Assistant community.
               <img src='/images/supported_brands/amcrest.png'>
             
           </div>
-          <div class='title'>Amcrest Camera</div>
+          <div class='title'>Amcrest IP Camera</div>
           <div class='category'>Camera</div>
         </a>
       
diff --git a/components/zoneminder/index.html b/components/zoneminder/index.html
index 005977984e..f46ebecc9b 100644
--- a/components/zoneminder/index.html
+++ b/components/zoneminder/index.html
@@ -153,7 +153,7 @@
     <h1 class="title delta">Category Camera</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/camera.amcrest/'>Amcrest Camera</a>
+            <a href='/components/camera.amcrest/'>Amcrest IP Camera</a>
         </li>
         <li>
             <a href='/components/camera.bloomsky/'>BloomSky Camera</a>
diff --git a/sitemap.xml b/sitemap.xml
index 2b319295b0..715f5b0208 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2154,6 +2154,9 @@
 <loc>https://home-assistant.io/components/sensor.nut/</loc>
 </url>
 <url>
+<loc>https://home-assistant.io/components/camera.amcrest/</loc>
+</url>
+<url>
 <loc>https://home-assistant.io/components/device_tracker.gpslogger/</loc>
 </url>
 <url>
@@ -2166,9 +2169,6 @@
 <loc>https://home-assistant.io/components/homematic/</loc>
 </url>
 <url>
-<loc>https://home-assistant.io/components/camera.amcrest/</loc>
-</url>
-<url>
 <loc>https://home-assistant.io/components/camera.nest/</loc>
 </url>
 <url>
@@ -2413,62 +2413,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2016-12-04T08:04:38+00:00</lastmod>
+<lastmod>2016-12-04T12:07:40+00:00</lastmod>
 </url>
 </urlset>