diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue
index 1009b9713..2d78c036b 100644
--- a/src/layouts/vehicle/vehicle.vue
+++ b/src/layouts/vehicle/vehicle.vue
@@ -80,7 +80,7 @@ import vehicleQuestion from "@/layouts/vehicle/vehicle-question/vehicle-question
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { experimentUniverses } from "@/constants/experiments";
-import { getSessionKeyValue, getUserIdValue } from "@/helpers/heritage-integration/cookie-helper";
+import { getSessionKeyValue, getUserIdValue, getDeviceIdValue } from "@/helpers/heritage-integration/cookie-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { Form, defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
@@ -185,6 +185,7 @@ export default {
                 storeActions.LOG_EXPERIMENT_EXPOSURE,
                 {
                     userId: getUserIdValue(),
+                    deviceId: getDeviceIdValue(),
                     sessionKey: getSessionKeyValue(),
                     pageName: to.query.fmgPage,
                     experiment: experimentForLogging,
diff --git a/src/router/index.js b/src/router/index.js
index a0be7d09e..76d1203b7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -797,7 +797,7 @@ async function runExperiments(nextPage) {
         await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
             {
-                userId: getDeviceIdValue(),
+                deviceId: getDeviceIdValue(),
                 triggerEvent: experimentTriggers.SITE_ENTRY,
                 triggerValue: applicationConfig.SITE_ENTRY_TRIGGER_VALUE,
             },
@@ -808,7 +808,7 @@ async function runExperiments(nextPage) {
     await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.RUN_EXPERIMENTS_FOR_TRIGGER,
         {
-            userId: getDeviceIdValue(),
+            deviceId: getDeviceIdValue(),
             triggerEvent: experimentTriggers.PAGE_ENTRY,
             triggerValue: nextPage,
         },
diff --git a/src/store/index.js b/src/store/index.js
index f423fb58d..0e2d6370e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1244,7 +1244,7 @@ export const actions = {
     // Analytics Actions
     logExperimentExposure(
         context,
-        { payload: { userId, sessionKey, pageName, experiment }, pageNameToLog }
+        { payload: { userId, deviceId, sessionKey, pageName, experiment }, pageNameToLog }
     ) {
         return globalMethods.callHttpClient({
             method: endpoints.LogExperimentExposureIfAssigned.method,
@@ -1252,6 +1252,7 @@ export const actions = {
             payload: {
                 experimentForLogging: {
                     userId: userId,
+                    deviceId: deviceId,
                     experimentUniverseId: experiment.universeId,
                     experimentUniverseName: experiment.universeName,
                     experimentTestId: experiment.testId,
@@ -1455,7 +1456,7 @@ export const actions = {
 
     async runExperimentsForTrigger(
         context,
-        { payload: { userId, triggerEvent, triggerValue }, pageNameToLog }
+        { payload: { deviceId, triggerEvent, triggerValue }, pageNameToLog }
     ) {
         if (triggerEvent == experimentTriggers.SITE_ENTRY) {
             context.commit(storeMutations.UPDATE_TRIGGERED_SITE_ENTRY, true);
@@ -1463,7 +1464,7 @@ export const actions = {
 
         var payload = {
             applicationName: applicationConfig.APPLICATION_NAME,
-            userId: userId,
+            deviceId: deviceId,
             triggerEvent: triggerEvent,
             triggerValue: triggerValue,
             experimentOrder: context.getters.experimentOrder,