diff --git a/resources/static/common/js/models/interaction_data.js b/resources/static/common/js/models/interaction_data.js
index f2ac0418da7d6443ff1e04d43b5d00826b03dd7f..c1df7522cdaea83ba6545fd4c8b3eec39d7ded75 100644
--- a/resources/static/common/js/models/interaction_data.js
+++ b/resources/static/common/js/models/interaction_data.js
@@ -18,8 +18,8 @@ BrowserID.Models.InteractionData = (function() {
         'sample_rate',
         'timestamp',
         'number_emails',
-        'sites_signed_in',
-        'sites_visited',
+        'number_sites_signed_in',
+        'number_sites_remembered',
         'orphaned',
         'new_account',
         'email_type'
diff --git a/resources/static/dialog/js/misc/state.js b/resources/static/dialog/js/misc/state.js
index fc7d7e63aca4cf16a94bd95c7e942eba58c18a22..dbbc613108d286c068384fe1c331dfbe2ae47f4f 100644
--- a/resources/static/dialog/js/misc/state.js
+++ b/resources/static/dialog/js/misc/state.js
@@ -101,8 +101,8 @@ BrowserID.State = (function() {
       // counted, any new sites are counted, any new emails are included, etc.
       mediator.publish("kpi_data", {
         number_emails: storage.getEmailCount() || 0,
-        sites_signed_in: storage.loggedInCount() || 0,
-        sites_visited: storage.site.count() || 0,
+        number_sites_signed_in: storage.loggedInCount() || 0,
+        number_sites_remembered: storage.site.count() || 0,
         orphaned: !self.success
      });
     });
diff --git a/resources/static/test/cases/common/js/models/interaction_data.js b/resources/static/test/cases/common/js/models/interaction_data.js
index 9e095b4860af36b4613aa9571cf0faf01bffde6c..deab52638ea8db94cd15649f2c3410dd09523e84 100644
--- a/resources/static/test/cases/common/js/models/interaction_data.js
+++ b/resources/static/test/cases/common/js/models/interaction_data.js
@@ -96,8 +96,8 @@
           local_timestamp: now,
           lang: "bar",
           number_emails: 1,
-          sites_signed_in: 2,
-          sites_visited: 3,
+          number_sites_signed_in: 2,
+          number_sites_remembered: 3,
           orphaned: false,
           new_account: true,
           email_type: "assertion"
@@ -119,8 +119,8 @@
             timestamp: now,
             lang: "bar",
             number_emails: 1,
-            sites_signed_in: 2,
-            sites_visited: 3,
+            number_sites_signed_in: 2,
+            number_sites_remembered: 3,
             orphaned: false,
             new_account: true,
             email_type: "assertion"
diff --git a/resources/static/test/cases/dialog/js/misc/state.js b/resources/static/test/cases/dialog/js/misc/state.js
index 1f84547a91d023058f3ffedc15eac5380409dfd5..50f12e31fc0e23a439e378270513899503511902 100644
--- a/resources/static/test/cases/dialog/js/misc/state.js
+++ b/resources/static/test/cases/dialog/js/misc/state.js
@@ -520,7 +520,7 @@
   asyncTest("window_unload - set the final KPIs", function() {
     mediator.subscribe("kpi_data", function(msg, data) {
       testHelpers.testKeysInObject(data, [
-        'number_emails', 'sites_signed_in', 'sites_visited', 'orphaned'
+        'number_emails', 'number_sites_signed_in', 'number_sites_remembered', 'orphaned'
       ]);
       start();
     });