diff --git a/src/more-infos/more-info-content.html b/src/more-infos/more-info-content.html
index 67da253387..0c462bb7d3 100644
--- a/src/more-infos/more-info-content.html
+++ b/src/more-infos/more-info-content.html
@@ -45,7 +45,7 @@ Polymer({
       }
     } else {
       window.hassUtil.dynamicContentUpdater(
-        this, 'MORE-INFO-' + window.hassUtil.stateMoreInfoType(stateObj).toUpperCase(),
+        this, 'more-info-' + window.hassUtil.stateMoreInfoType(stateObj),
         { hass: this.hass, stateObj: stateObj, isVisible: true });
     }
   },
diff --git a/src/util/hass-util.html b/src/util/hass-util.html
index d5d6bc92d9..a08936bf1f 100644
--- a/src/util/hass-util.html
+++ b/src/util/hass-util.html
@@ -76,7 +76,7 @@ window.hassUtil.dynamicContentUpdater = function (root, newElementTag, attribute
   var rootEl = Polymer.dom(root);
   var customEl;
 
-  if (rootEl.lastChild && rootEl.lastChild.tagName === newElementTag) {
+  if (rootEl.lastChild && rootEl.lastChild.tagName.toLowerCase() === newElementTag) {
     customEl = rootEl.lastChild;
   } else {
     if (rootEl.lastChild) {