diff --git a/changelog/fix-7395 b/changelog/fix-7395
new file mode 100644
index 00000000000..9d6115e20b2
--- /dev/null
+++ b/changelog/fix-7395
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Updating tracks events
+
+
diff --git a/client/payment-details/dispute-details/dispute-awaiting-response-details.tsx b/client/payment-details/dispute-details/dispute-awaiting-response-details.tsx
index c4877d7030b..fe3aa20c942 100644
--- a/client/payment-details/dispute-details/dispute-awaiting-response-details.tsx
+++ b/client/payment-details/dispute-details/dispute-awaiting-response-details.tsx
@@ -255,9 +255,10 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( {
 									onClick={ () => {
 										wcpayTracks.recordEvent(
 											wcpayTracks.events
-												.DISPUTE_CHALLENGE_CLICK,
+												.DISPUTE_CHALLENGE_CLICKED,
 											{
 												dispute_status: dispute.status,
+												on_page: 'transaction_details',
 											}
 										);
 									} }
@@ -279,6 +280,7 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( {
 										disputeAcceptAction.acceptButtonTracksEvent,
 										{
 											dispute_status: dispute.status,
+											on_page: 'transaction_details',
 										}
 									);
 									setModalOpen( true );
@@ -337,6 +339,8 @@ const DisputeAwaitingResponseDetails: React.FC< Props > = ( {
 													{
 														dispute_status:
 															dispute.status,
+														on_page:
+															'transaction_details',
 													}
 												);
 												setModalOpen( false );
diff --git a/client/payment-details/dispute-details/dispute-resolution-footer.tsx b/client/payment-details/dispute-details/dispute-resolution-footer.tsx
index 163956f7a3b..92d7e0a987c 100644
--- a/client/payment-details/dispute-details/dispute-resolution-footer.tsx
+++ b/client/payment-details/dispute-details/dispute-resolution-footer.tsx
@@ -70,9 +70,10 @@ const DisputeUnderReviewFooter: React.FC< {
 							onClick={ () => {
 								wcpayTracks.recordEvent(
 									wcpayTracks.events
-										.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICK,
+										.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICKED,
 									{
 										dispute_status: dispute.status,
+										on_page: 'transaction_details',
 									}
 								);
 							} }
@@ -141,9 +142,10 @@ const DisputeWonFooter: React.FC< {
 							onClick={ () => {
 								wcpayTracks.recordEvent(
 									wcpayTracks.events
-										.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICK,
+										.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICKED,
 									{
 										dispute_status: dispute.status,
+										on_page: 'transaction_details',
 									}
 								);
 							} }
@@ -250,9 +252,10 @@ const DisputeLostFooter: React.FC< {
 								onClick={ () => {
 									wcpayTracks.recordEvent(
 										wcpayTracks.events
-											.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICK,
+											.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICKED,
 										{
 											dispute_status: dispute.status,
+											on_page: 'transaction_details',
 										}
 									);
 								} }
@@ -322,9 +325,10 @@ const InquiryUnderReviewFooter: React.FC< {
 							onClick={ () => {
 								wcpayTracks.recordEvent(
 									wcpayTracks.events
-										.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICK,
+										.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICKED,
 									{
 										dispute_status: dispute.status,
+										on_page: 'transaction_details',
 									}
 								);
 							} }
@@ -396,9 +400,10 @@ const InquiryClosedFooter: React.FC< {
 								onClick={ () => {
 									wcpayTracks.recordEvent(
 										wcpayTracks.events
-											.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICK,
+											.PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICKED,
 										{
 											dispute_status: dispute.status,
+											on_page: 'transaction_details',
 										}
 									);
 								} }
diff --git a/client/tracks/index.js b/client/tracks/index.js
index 4b065bceefd..4dc253734ec 100644
--- a/client/tracks/index.js
+++ b/client/tracks/index.js
@@ -68,7 +68,7 @@ const events = {
 	DEPOSITS_ROW_CLICK: 'wcpay_deposits_row_click',
 	DEPOSITS_DOWNLOAD_CSV_CLICK: 'wcpay_deposits_download',
 	DISPUTES_ROW_ACTION_CLICK: 'wcpay_disputes_row_action_click',
-	DISPUTE_CHALLENGE_CLICK: 'wcpay_dispute_challenge_click',
+	DISPUTE_CHALLENGE_CLICKED: 'wcpay_dispute_challenge_clicked',
 	DISPUTE_ACCEPT_CLICK: 'wcpay_dispute_accept_click',
 	DISPUTE_ACCEPT_MODAL_VIEW: 'wcpay_dispute_accept_modal_view',
 	DISPUTE_INQUIRY_REFUND_CLICK: 'wcpay_dispute_inquiry_refund_click',
@@ -83,8 +83,8 @@ const events = {
 	OVERVIEW_DEPOSITS_CHANGE_SCHEDULE_CLICK:
 		'wcpay_overview_deposits_change_schedule_click',
 	OVERVIEW_TASK_CLICK: 'wcpay_overview_task_click',
-	PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICK:
-		'wcpay_payment_details_view_dispute_evidence_button_click',
+	PAYMENT_DETAILS_VIEW_DISPUTE_EVIDENCE_BUTTON_CLICKED:
+		'wcpay_view_submitted_evidence_clicked',
 	SETTINGS_DEPOSITS_MANAGE_IN_STRIPE_CLICK:
 		'wcpay_settings_deposits_manage_in_stripe_click',
 	MULTI_CURRENCY_ENABLED_CURRENCIES_UPDATED: