diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html
index c8981deedeb..08e22a0ec81 100755
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-toggle.html
@@ -72,7 +72,7 @@
       // with the state. It will be out of sync if our service call did not
       // result in the entity to be turned on. Since the state is not changing,
       // the resync is not called automatic.
-      window.hass.serviceActions.callTurnOn(this.stateObj.entity_id)
+      window.hass.serviceActions.callTurnOn(this.stateObj.entityId)
         .then(this.forceStateChange);
     },
 
@@ -81,7 +81,7 @@
       // with the state. It will be out of sync if our service call did not
       // result in the entity to be turned on. Since the state is not changing,
       // the resync is not called automatic.
-      window.hass.serviceActions.callTurnOff(this.stateObj.entity_id)
+      window.hass.serviceActions.callTurnOff(this.stateObj.entityId)
         .then(this.forceStateChange);
     },
 
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
index 304bde3f161..5973011ec79 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card.html
@@ -25,7 +25,7 @@
 Polymer({
 
   cardClicked: function() {
-    window.hass.uiActions.showMoreInfoDialog(this.stateObj.entity_id);
+    window.hass.uiActions.showMoreInfoDialog(this.stateObj.entityId);
   },
 
 });
diff --git a/homeassistant/components/frontend/www_static/polymer/components/entity-list.html b/homeassistant/components/frontend/www_static/polymer/components/entity-list.html
index adc02ca2ad6..8d6946a7fa1 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/entity-list.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/entity-list.html
@@ -24,7 +24,7 @@
     <div>
       <template repeat="{{state in states}}">
         <div class='eventContainer'>
-          <a on-click={{handleClick}}>{{state.entity_id}}</a>
+          <a on-click={{handleClick}}>{{state.entityId}}</a>
         </div>
       </template>
 
diff --git a/homeassistant/components/frontend/www_static/polymer/components/recent-states.html b/homeassistant/components/frontend/www_static/polymer/components/recent-states.html
index e276992af15..5f8463c74bb 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/recent-states.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/recent-states.html
@@ -37,7 +37,7 @@
       this.recentStates = null;
 
       window.hass.callApi(
-        'GET', 'history/entity/' + this.stateObj.entity_id + '/recent_states').then(
+        'GET', 'history/entity/' + this.stateObj.entityId + '/recent_states').then(
           function(states) {
             this.recentStates = states.slice(1);
           }.bind(this));
diff --git a/homeassistant/components/frontend/www_static/polymer/home-assistant-js b/homeassistant/components/frontend/www_static/polymer/home-assistant-js
index 68908b8dec6..373e9675175 160000
--- a/homeassistant/components/frontend/www_static/polymer/home-assistant-js
+++ b/homeassistant/components/frontend/www_static/polymer/home-assistant-js
@@ -1 +1 @@
-Subproject commit 68908b8dec636f9b0f87f7c929bf8546d19aa11f
+Subproject commit 373e96751759dfdf811c897916eef77ebc575ea4
diff --git a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html
index dc044bec416..166bb899344 100644
--- a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html
+++ b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-light.html
@@ -85,10 +85,10 @@ Polymer({
     if(isNaN(bri)) return;
 
     if(bri === 0) {
-      window.hass.serviceActions.callTurnOff(this.stateObj.entity_id);
+      window.hass.serviceActions.callTurnOff(this.stateObj.entityId);
     } else {
       window.hass.serviceActions.callService("light", "turn_on", {
-        entity_id: this.stateObj.entity_id,
+        entity_id: this.stateObj.entityId,
         brightness: bri
       });
     }
@@ -98,7 +98,7 @@ Polymer({
     var color = ev.detail.rgb;
 
     window.hass.serviceActions.callService("light", "turn_on", {
-      entity_id: this.stateObj.entity_id,
+      entity_id: this.stateObj.entityId,
       rgb_color: [color.r, color.g, color.b]
     });
   }