diff --git a/src/dialogs/more-info-dialog.html b/src/dialogs/ha-more-info-dialog.html
similarity index 94%
rename from src/dialogs/more-info-dialog.html
rename to src/dialogs/ha-more-info-dialog.html
index 54b5a5efaf..b85bc187af 100644
--- a/src/dialogs/more-info-dialog.html
+++ b/src/dialogs/ha-more-info-dialog.html
@@ -10,7 +10,7 @@
 <link rel='import' href='./more-info/more-info-controls.html'>
 <link rel='import' href='./more-info/more-info-settings.html'>
 
-<dom-module id="more-info-dialog">
+<dom-module id="ha-more-info-dialog">
   <template>
     <style include="ha-style-dialog">
       paper-dialog {
@@ -77,8 +77,8 @@
 </dom-module>
 
 <script>
-class MoreInfoDialog extends window.hassMixins.EventsMixin(Polymer.Element) {
-  static get is() { return 'more-info-dialog'; }
+class HaMoreInfoDialog extends window.hassMixins.EventsMixin(Polymer.Element) {
+  static get is() { return 'ha-more-info-dialog'; }
   static get properties() {
     return {
       hass: Object,
@@ -155,5 +155,5 @@ class MoreInfoDialog extends window.hassMixins.EventsMixin(Polymer.Element) {
     return a === b;
   }
 }
-customElements.define(MoreInfoDialog.is, MoreInfoDialog);
+customElements.define(HaMoreInfoDialog.is, HaMoreInfoDialog);
 </script>
diff --git a/src/layouts/home-assistant-main.html b/src/layouts/home-assistant-main.html
index f99bf48766..847ecdfc9f 100644
--- a/src/layouts/home-assistant-main.html
+++ b/src/layouts/home-assistant-main.html
@@ -7,7 +7,7 @@
 
 <link rel='import' href='../layouts/partial-cards.html'>
 <link rel='import' href='../layouts/partial-panel-resolver.html'>
-<link rel="import" href="../dialogs/more-info-dialog.html">
+<link rel="import" href="../dialogs/ha-more-info-dialog.html">
 <link rel="import" href="../dialogs/ha-voice-command-dialog.html">
 <link rel='import' href='../util/ha-url-sync.html'>
 
@@ -31,7 +31,7 @@
         height: 100%;
       }
     </style>
-    <more-info-dialog hass='[[hass]]'></more-info-dialog>
+    <ha-more-info-dialog hass='[[hass]]'></ha-more-info-dialog>
     <ha-url-sync hass='[[hass]]'></ha-url-sync>
     <app-route
       route="{{route}}"