diff --git a/ui/js/eva_sfa.js b/ui/js/eva_sfa.js
index e76bf6e74..ef0324b44 100644
--- a/ui/js/eva_sfa.js
+++ b/ui/js/eva_sfa.js
@@ -298,7 +298,7 @@ function eva_sfa_register_rule(rule_id, cb) {
  */
 function eva_sfa_state(oid) {
   if (!oid.includes('*')) {
-    return eva_sfa_item(oid).state;
+    return eva_sfa_item(oid).data;
   }
   var result = new Array();
   $.each(Object.keys(eva_sfa_items), function(i, v) {
@@ -1182,22 +1182,22 @@ function eva_sfa_process_ws(evt) {
 function eva_sfa_process_state(state) {
   var oid = state.type + ':' + state.group + '/' + state.id;
   var fncs = Array();
-  var old_state = eva_sfa_item(oid).state;
+  var old_data = eva_sfa_item(oid).data;
   var state_change = false;
   var state_load = false;
-  eva_sfa_item(oid).state = state;
-  if (!old_state) {
+  eva_sfa_item(oid).data = state;
+  if (!old_data) {
     state_load = true;
     if (eva_sfa_item(oid).on_load) {
       fncs.push(eva_sfa_item(oid).on_load);
     }
   } else {
-    $.each(Object.getOwnPropertyNames(old_state), function(k, v) {
+    $.each(Object.getOwnPropertyNames(old_data), function(k, v) {
       if (!(v in state)) {
-        state[v] = old_state[v];
+        state[v] = old_data[v];
       }
     });
-    if (!eva_sfa_cmp(old_state, state)) {
+    if (!eva_sfa_cmp(old_data, state)) {
       state_change = true;
       if (eva_sfa_item(oid).on_change) {
         fncs.push(eva_sfa_item(oid).on_change);