diff --git a/src/components/dataset-data/dataset-data.spec.js b/src/components/dataset-data/dataset-data.spec.js
index c5ec515fd..63712790f 100644
--- a/src/components/dataset-data/dataset-data.spec.js
+++ b/src/components/dataset-data/dataset-data.spec.js
@@ -453,7 +453,7 @@ describe('DatasetData', () => {
 
     expect(analyticsSpy).toHaveBeenLastCalledWith({
       action: 'Published Report Preview',
-      category: 'Fiscal Data - Published Report Preview',
+      category: 'Published Report Preview',
       label: '/downloads/mspd_reports/opdm092020.pdf',
     });
     analyticsSpy.mockClear();
diff --git a/src/components/dataset-data/table-section-container/pivot-options/pivot-options.jsx b/src/components/dataset-data/table-section-container/pivot-options/pivot-options.jsx
index 79e498ec1..3dc4e427e 100644
--- a/src/components/dataset-data/table-section-container/pivot-options/pivot-options.jsx
+++ b/src/components/dataset-data/table-section-container/pivot-options/pivot-options.jsx
@@ -30,7 +30,7 @@ const PivotOptions = ({ datasetName, table, pivotSelection, setSelectedPivot, pi
     }
 
     Analytics.event({
-      category: 'Fiscal Data - Chart Enabled',
+      category: 'Chart Enabled',
       action: 'Pivot View Click',
       label: `${view.title}, ${datasetName}, ${table.tableName}`,
     });
@@ -42,7 +42,7 @@ const PivotOptions = ({ datasetName, table, pivotSelection, setSelectedPivot, pi
   const pivotValueChangeHandler = valueField => {
     if (valueField?.prettyName !== '— N / A —') {
       Analytics.event({
-        category: 'Fiscal Data - Chart Enabled',
+        category: 'Chart Enabled',
         action: 'Pivot Value Click',
         label: `${valueField?.prettyName}, ${datasetName}, ${table.tableName}`,
       });
diff --git a/src/components/dataset-data/table-section-container/table-section-container.jsx b/src/components/dataset-data/table-section-container/table-section-container.jsx
index eafdb1403..0d1a5fdca 100644
--- a/src/components/dataset-data/table-section-container/table-section-container.jsx
+++ b/src/components/dataset-data/table-section-container/table-section-container.jsx
@@ -251,7 +251,7 @@ const TableSectionContainer = ({
     if (e.key === undefined || e.key === 'Enter') {
       if (legend) {
         Analytics.event({
-          category: 'Fiscal Data - Chart Enabled',
+          category: 'Chart Enabled',
           action: 'Hide Legend Click',
           label: `${config.name}, ${selectedTable.tableName}`,
         });
@@ -266,7 +266,7 @@ const TableSectionContainer = ({
   const pivotToggler = () => {
     if (showPivotBar) {
       Analytics.event({
-        category: 'Fiscal Data - Chart Enabled',
+        category: 'Chart Enabled',
         action: 'Hide Pivot Options Click',
         label: `${config.name}, ${selectedTable.tableName}`,
       });
@@ -341,7 +341,13 @@ const TableSectionContainer = ({
           )}
           <div className={barContainer}>
             <div className={`${barExpander} ${showPivotBar ? active : ''}`} data-testid="pivotOptionsDrawer">
-              <PivotOptions table={selectedTable} pivotSelection={selectedPivot} setSelectedPivot={setSelectedPivot} pivotsUpdated={pivotsUpdated} />
+              <PivotOptions
+                datasetName={config?.name}
+                table={selectedTable}
+                pivotSelection={selectedPivot}
+                setSelectedPivot={setSelectedPivot}
+                pivotsUpdated={pivotsUpdated}
+              />
             </div>
           </div>
         </div>
@@ -375,6 +381,7 @@ const TableSectionContainer = ({
                 emptyData={!isLoading && !serverSidePagination && (!apiData || !apiData.data || !apiData.data.length) && !apiError}
                 unchartable={noChartMessage !== undefined}
                 currentTab={selectedTab}
+                datasetName={config?.name}
                 onTabChange={tabChangeHandler}
                 selectedTable={selectedTable}
                 setResetFilters={setResetFilters}
diff --git a/src/components/dataset-detail-nav/dataset-detail-nav.jsx b/src/components/dataset-detail-nav/dataset-detail-nav.jsx
index d1e2ccf05..71f7dd8d0 100644
--- a/src/components/dataset-detail-nav/dataset-detail-nav.jsx
+++ b/src/components/dataset-detail-nav/dataset-detail-nav.jsx
@@ -54,7 +54,7 @@ const DDNav = () => {
 
     if (id) {
       Analytics.event({
-        category: 'Fiscal Data - Dataset Sub Nav',
+        category: 'Dataset Sub Nav',
         action: 'Dataset Sub Nav Click',
         label: id,
       });
diff --git a/src/components/published-reports/preview/preview.jsx b/src/components/published-reports/preview/preview.jsx
index 8230486b1..0bf565107 100644
--- a/src/components/published-reports/preview/preview.jsx
+++ b/src/components/published-reports/preview/preview.jsx
@@ -42,7 +42,7 @@ const Preview = ({ selectedFile }) => {
           eventLabel: selectedFile.path,
         });
         Analytics.event({
-          category: 'Fiscal Data - Published Report Preview',
+          category: 'Published Report Preview',
           action: 'Published Report Preview',
           label: selectedFile.path,
         });
diff --git a/src/components/published-reports/preview/preview.spec.js b/src/components/published-reports/preview/preview.spec.js
index 544f17098..522065257 100644
--- a/src/components/published-reports/preview/preview.spec.js
+++ b/src/components/published-reports/preview/preview.spec.js
@@ -83,7 +83,7 @@ describe('Preview component', () => {
     });
     expect(spy).toHaveBeenCalledWith({
       action: 'Published Report Preview',
-      category: 'Fiscal Data - Published Report Preview',
+      category: 'Published Report Preview',
       label: 'helloAgain.pdf',
     });