diff --git a/src/components/Gradebook/index.jsx b/src/components/Gradebook/index.jsx
index 9adeaca..705a84d 100644
--- a/src/components/Gradebook/index.jsx
+++ b/src/components/Gradebook/index.jsx
@@ -309,8 +309,7 @@ export default class Gradebook extends React.Component {
       name: 'edx.gradebook.reports.grade_export.downloaded',
       properties: {
         category: trackingCategory,
-        courseId: this.props.courseId,
-        label: this.props.courseId, // check to see if google analytics captures label property
+        label: this.props.courseId,
       },
     }));
     window.location = this.props.gradeExportUrl;
@@ -321,8 +320,7 @@ export default class Gradebook extends React.Component {
       name: 'edx.gradebook.reports.intervention.downloaded',
       properties: {
         category: trackingCategory,
-        courseId: this.props.courseId,
-        label: this.props.courseId, // check to see if google analytics captures label property
+        label: this.props.courseId,
       },
     }));
     window.location = this.props.interventionExportUrl;
@@ -526,7 +524,7 @@ export default class Gradebook extends React.Component {
         name: 'edx.gradebook.grades.filter_applied',
         properties: {
           category: trackingCategory,
-          courseId: this.props.courseId,
+          label: this.props.courseId,
           cohort: this.props.selectedCohort,
           track: this.props.selectedTrack,
           assignmentType: this.props.selectedAssignmentType,
diff --git a/src/data/store.js b/src/data/store.js
index 39e7e74..5ef9a78 100755
--- a/src/data/store.js
+++ b/src/data/store.js
@@ -24,9 +24,8 @@ const eventsMap = {
     name: 'edx.gradebook.grades.displayed',
     properties: {
       category: trackingCategory,
-      courseId: action.courseId,
-      track: action.track,
       label: action.courseId,
+      track: action.track,
       cohort: action.cohort,
       assignmentType: action.assignmentType,
       prev: action.prev,
@@ -35,10 +34,9 @@ const eventsMap = {
   })),
   [GRADE_UPDATE_SUCCESS]: trackEvent(action => ({
     name: 'edx.gradebook.grades.grade_override.succeeded',
-    label: action.courseId,
     properties: {
       category: trackingCategory,
-      courseId: action.courseId,
+      label: action.courseId,
       updatedGrades: action.payload.responseData,
     },
   })),
@@ -46,7 +44,7 @@ const eventsMap = {
     name: 'edx.gradebook.grades.grade_override.failed',
     properties: {
       category: trackingCategory,
-      courseId: action.courseId,
+      label: action.courseId,
       error: action.payload.error,
     },
   })),
@@ -54,14 +52,14 @@ const eventsMap = {
     name: 'edx.gradebook.grades.upload.grades_overrides.succeeded',
     properties: {
       category: trackingCategory,
-      courseId: action.courseId,
+      label: action.courseId,
     },
   })),
   [UPLOAD_OVERRIDE_ERROR]: trackEvent(action => ({
     name: 'edx.gradebook.grades.upload.grades_overrides.failed',
     properties: {
       category: trackingCategory,
-      courseId: action.courseId,
+      label: action.courseId,
       error: action.payload.error,
     },
   })),