diff --git a/atom.xml b/atom.xml
index 7ce16db0cd..556eea1a8a 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 69bfe34847..0f567e7838 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 b10b505f46..b499101e9b 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 383d43db07..1e35c2a8c9 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 3f9c539a6a..f3cfbbfc96 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 10b60b8d7c..5b1094a2f0 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 e0b0043247..7156e6012a 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 e3c15094ed..ad48a1daf0 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 e1d91d7177..ed72f3b3fb 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 1042cd7932..f552dbef73 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 4deb8a1fc3..63ef3ae2a7 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 a89a538fe5..1ab1ef3257 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 d3be7bf733..d73321fb02 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 f4fe5d6ee8..c4580ec3f6 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 dcd530560e..f221ffafbf 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 eb13c3cfb1..719bd96ec4 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 974c7d8213..9721157eb0 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 d698ec4f47..ef0a12ccb9 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 6c37cd1cd8..6f1d6f4642 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 d1605aa1bf..d7f8f2a2f3 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+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 f0c007af73..c7e31df580 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>2017-01-17T06:24:49+00:00</updated>
+  <updated>2017-01-17T07:32:57+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Home Assistant]]></name>
diff --git a/components/index.html b/components/index.html
index 019afb3b06..9f811bf5fb 100644
--- a/components/index.html
+++ b/components/index.html
@@ -726,6 +726,38 @@ Support for these components is provided by the Home Assistant community.
       
       
       
+        <a href='/components/weather.bom/'
+           class='weather added_in_current_version'
+           style='display: none'>
+          <div class='img-container'>
+            
+              <img src='/images/supported_brands/bom.png'>
+            
+          </div>
+          <div class='title'>BOM Australia</div>
+          <div class='category'>Weather</div>
+        </a>
+      
+    
+      
+      
+      
+        <a href='/components/sensor.bom/'
+           class='weather'
+           style='display: none'>
+          <div class='img-container'>
+            
+              <img src='/images/supported_brands/bom.png'>
+            
+          </div>
+          <div class='title'>BOM Australia Sensor</div>
+          <div class='category'>Weather</div>
+        </a>
+      
+    
+      
+      
+      
         <a href='/components/device_tracker.bt_home_hub_5/'
            class='presence-detection'
            style='display: none'>
@@ -1032,38 +1064,6 @@ Support for these components is provided by the Home Assistant community.
       
       
       
-        <a href='/components/sensor.bom/'
-           class='weather'
-           style='display: none'>
-          <div class='img-container'>
-            
-              <img src='/images/supported_brands/bom.png'>
-            
-          </div>
-          <div class='title'>Bureau of Meteorology (BOM) Australia</div>
-          <div class='category'>Weather</div>
-        </a>
-      
-    
-      
-      
-      
-        <a href='/components/weather.bom/'
-           class='weather added_in_current_version'
-           style='display: none'>
-          <div class='img-container'>
-            
-              <img src='/images/supported_brands/bom.png'>
-            
-          </div>
-          <div class='title'>Bureau of Meteorology (BOM) Australia</div>
-          <div class='category'>Weather</div>
-        </a>
-      
-    
-      
-      
-      
         <a href='/components/sensor.cpuspeed/'
            class='system-monitor'
            style='display: none'>
diff --git a/components/sensor.bom/index.html b/components/sensor.bom/index.html
index 0d2e92d3c4..e84886a582 100644
--- a/components/sensor.bom/index.html
+++ b/components/sensor.bom/index.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Bureau of Meteorology (BOM) Australia - Home Assistant</title>
+    <title>BOM Australia Sensor - Home Assistant</title>
     <meta name="author" content="Home Assistant">
     <meta name="description" content="Instructions on how to integrate Bureau of Meteorology Australia weather conditions into Home Assistant.">
     
@@ -15,7 +15,7 @@
     <link rel="canonical" href="https://home-assistant.io/components/sensor.bom/">
 
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Bureau of Meteorology (BOM) Australia">
+    <meta property="og:title" content="BOM Australia Sensor">
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/components/sensor.bom/">
     <meta property="og:type" content="article">
@@ -25,7 +25,7 @@
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="@home_assistant">
     
-    <meta name="twitter:title" content="Bureau of Meteorology (BOM) Australia">
+    <meta name="twitter:title" content="BOM Australia Sensor">
     <meta name="twitter:description" content="Instructions on how to integrate Bureau of Meteorology Australia weather conditions into Home Assistant.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
 
@@ -84,7 +84,7 @@
   
   <header>
     <h1 class="title indent">
-      Bureau of Meteorology (BOM) Australia
+      BOM Australia Sensor
     </h1>
   </header>
   <hr class="divider">
@@ -179,7 +179,7 @@ The weather platform is easier to configure but less customisable.
           <h1 class='title delta'>Related components</h1>
           <ul class='divided'>
         <li><a href='/components/weather.bom/'>
-          Bureau of Meteorology (BOM) Australia
+          BOM Australia
         </a></li>
     </ul>
     </div>
@@ -187,10 +187,10 @@ The weather platform is easier to configure but less customisable.
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            Bureau of Meteorology (BOM) Australia
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            BOM Australia Sensor
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.darksky/index.html b/components/sensor.darksky/index.html
index 9d7b345e5c..9e08ea5bcf 100644
--- a/components/sensor.darksky/index.html
+++ b/components/sensor.darksky/index.html
@@ -213,10 +213,10 @@ Note: While the platform is called “darksky” the sensors will show up in Hom
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             Dark Sky
diff --git a/components/sensor.nest_weather/index.html b/components/sensor.nest_weather/index.html
index 836d74de2f..25ce3d47a7 100644
--- a/components/sensor.nest_weather/index.html
+++ b/components/sensor.nest_weather/index.html
@@ -147,10 +147,10 @@ You must have the <a href="/components/nest/">Nest component</a> configured to u
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.netatmo/index.html b/components/sensor.netatmo/index.html
index edc82625f5..ea946d9912 100644
--- a/components/sensor.netatmo/index.html
+++ b/components/sensor.netatmo/index.html
@@ -194,10 +194,10 @@
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.openweathermap/index.html b/components/sensor.openweathermap/index.html
index 919cc22e58..b7a82514cf 100644
--- a/components/sensor.openweathermap/index.html
+++ b/components/sensor.openweathermap/index.html
@@ -161,10 +161,10 @@
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.swiss_hydrological_data/index.html b/components/sensor.swiss_hydrological_data/index.html
index 535e6de928..c39f24fdc2 100644
--- a/components/sensor.swiss_hydrological_data/index.html
+++ b/components/sensor.swiss_hydrological_data/index.html
@@ -151,10 +151,10 @@
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.wunderground/index.html b/components/sensor.wunderground/index.html
index ae12f0b1f2..7d29889bb9 100644
--- a/components/sensor.wunderground/index.html
+++ b/components/sensor.wunderground/index.html
@@ -224,10 +224,10 @@ Obtain a WUnderground API key <a href="https://www.wunderground.com/weather/api"
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.yr/index.html b/components/sensor.yr/index.html
index b9b78f3f15..ddb57ffacd 100644
--- a/components/sensor.yr/index.html
+++ b/components/sensor.yr/index.html
@@ -168,10 +168,10 @@ weather forecast is delivered by the Norwegian Meteorological Institute and the
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.yweather/index.html b/components/sensor.yweather/index.html
index 67a49a5571..d35bcdf071 100644
--- a/components/sensor.yweather/index.html
+++ b/components/sensor.yweather/index.html
@@ -163,10 +163,10 @@ Use of the Yahoo Weather API should not exceed reasonable request volume. Access
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor.zamg/index.html b/components/sensor.zamg/index.html
index 3ad4734b4d..5eefb56a04 100644
--- a/components/sensor.zamg/index.html
+++ b/components/sensor.zamg/index.html
@@ -224,10 +224,10 @@
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/sensor/index.html b/components/sensor/index.html
index fc7a66571f..2aa0046b49 100644
--- a/components/sensor/index.html
+++ b/components/sensor/index.html
@@ -124,6 +124,9 @@
           <li><a href='/components/sensor.arduino/'>
             Arduino Sensor
           </a></li>
+          <li><a href='/components/sensor.bom/'>
+            BOM Australia Sensor
+          </a></li>
           <li><a href='/components/sensor.bbox/'>
             Bbox Sensor
           </a></li>
@@ -136,9 +139,6 @@
           <li><a href='/components/sensor.broadlink/'>
             Broadlink RM2 and A1 sensor
           </a></li>
-          <li><a href='/components/sensor.bom/'>
-            Bureau of Meteorology (BOM) Australia
-          </a></li>
           <li><a href='/components/sensor.cpuspeed/'>
             CPU speed
           </a></li>
diff --git a/components/sun/index.html b/components/sun/index.html
index 6ebf44369d..ceeaee14ea 100644
--- a/components/sun/index.html
+++ b/components/sun/index.html
@@ -190,10 +190,10 @@
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/weather.bom/index.html b/components/weather.bom/index.html
index ca6909f1a3..041c102448 100644
--- a/components/weather.bom/index.html
+++ b/components/weather.bom/index.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Bureau of Meteorology (BOM) Australia - Home Assistant</title>
+    <title>BOM Australia - Home Assistant</title>
     <meta name="author" content="Home Assistant">
     <meta name="description" content="Instructions on how to integrate Bureau of Meteorology Australia weather conditions into Home Assistant.">
     
@@ -15,7 +15,7 @@
     <link rel="canonical" href="https://home-assistant.io/components/weather.bom/">
 
     <meta property="fb:app_id" content="338291289691179">
-    <meta property="og:title" content="Bureau of Meteorology (BOM) Australia">
+    <meta property="og:title" content="BOM Australia">
     <meta property="og:site_name" content="Home Assistant">
     <meta property="og:url" content="https://home-assistant.io/components/weather.bom/">
     <meta property="og:type" content="article">
@@ -25,7 +25,7 @@
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:site" content="@home_assistant">
     
-    <meta name="twitter:title" content="Bureau of Meteorology (BOM) Australia">
+    <meta name="twitter:title" content="BOM Australia">
     <meta name="twitter:description" content="Instructions on how to integrate Bureau of Meteorology Australia weather conditions into Home Assistant.">
     <meta name="twitter:image" content="https://home-assistant.io/images/default-social.png">
 
@@ -84,7 +84,7 @@
   
   <header>
     <h1 class="title indent">
-      Bureau of Meteorology (BOM) Australia
+      BOM Australia
     </h1>
   </header>
   <hr class="divider">
@@ -138,7 +138,7 @@ The weather platform is easier to configure but less customisable.
           <h1 class='title delta'>Related components</h1>
           <ul class='divided'>
         <li><a href='/components/sensor.bom/'>
-          Bureau of Meteorology (BOM) Australia
+          BOM Australia Sensor
         </a></li>
     </ul>
     </div>
@@ -146,10 +146,10 @@ The weather platform is easier to configure but less customisable.
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            BOM Australia
         </li>
         <li>
-            Bureau of Meteorology (BOM) Australia
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/weather.openweathermap/index.html b/components/weather.openweathermap/index.html
index 9117d0a987..6e4d0a1276 100644
--- a/components/weather.openweathermap/index.html
+++ b/components/weather.openweathermap/index.html
@@ -152,10 +152,10 @@ This platform is an alternative to the <a href="/components/sensor.openweatherma
     <h1 class="title delta">Category Weather</h1>
     <ul class='divided'>
         <li>
-            <a href='/components/sensor.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/weather.bom/'>BOM Australia</a>
         </li>
         <li>
-            <a href='/components/weather.bom/'>Bureau of Meteorology (BOM) Australia</a>
+            <a href='/components/sensor.bom/'>BOM Australia Sensor</a>
         </li>
         <li>
             <a href='/components/sensor.darksky/'>Dark Sky</a>
diff --git a/components/weather/index.html b/components/weather/index.html
index b4a99a4a2f..3ca5994d75 100644
--- a/components/weather/index.html
+++ b/components/weather/index.html
@@ -113,7 +113,7 @@
             <h1 class='title delta'>Platforms</h1>
             <ul class='divided'>
           <li><a href='/components/weather.bom/'>
-            Bureau of Meteorology (BOM) Australia
+            BOM Australia
           </a></li>
           <li><a href='/components/weather.openweathermap/'>
             OpenWeatherMap
diff --git a/sitemap.xml b/sitemap.xml
index 21ad5fe795..db0608ecbe 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2615,62 +2615,62 @@
 </url>
 <url>
 <loc>https://home-assistant.io/demo/frontend.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/index.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-event.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-info.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-service.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-state.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-dev-template.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-history.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-iframe.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-logbook.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/demo/panels/ha-panel-map.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 <url>
 <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-<lastmod>2017-01-17T06:24:06+00:00</lastmod>
+<lastmod>2017-01-17T07:32:08+00:00</lastmod>
 </url>
 </urlset>