diff --git a/resources/ext.popups.desktop/ext.popups.renderer.article.js b/resources/ext.popups.desktop/ext.popups.renderer.article.js
index 12b03c843..5b58f271f 100644
--- a/resources/ext.popups.desktop/ext.popups.renderer.article.js
+++ b/resources/ext.popups.desktop/ext.popups.renderer.article.js
@@ -68,7 +68,7 @@
 		currentRequest.fail( function ( textStatus, data ) {
 			// only log genuine errors, not client aborts
 			if ( data.textStatus !== 'abort' ) {
-				mw.track( 'ext.popups.schemaPopups', $.extend( logData, {
+				mw.track( 'ext.popups.event', $.extend( logData, {
 					action: 'error',
 					errorState: textStatus,
 					totalInteractionTime: Math.round( mw.now() - logData.dwellStartTime )
@@ -552,7 +552,7 @@
 
 			mw.popups.settings.open( $.extend( {}, logData ) );
 
-			mw.track( 'ext.popups.schemaPopups', $.extend( logData, {
+			mw.track( 'ext.popups.event', $.extend( logData, {
 				action: 'tapped settings cog',
 				totalInteractionTime: Math.round( mw.now() - logData.dwellStartTime )
 			} ) );
diff --git a/resources/ext.popups.desktop/ext.popups.settings.js b/resources/ext.popups.desktop/ext.popups.settings.js
index 8e2aa8d01..1b46ee07e 100644
--- a/resources/ext.popups.desktop/ext.popups.settings.js
+++ b/resources/ext.popups.desktop/ext.popups.settings.js
@@ -85,7 +85,7 @@
 			mw.popups.saveEnabledState( false );
 			$( '#mwe-popups-settings-form, #mwe-popups-settings .save' ).hide();
 			$( '#mwe-popups-settings-help, #mwe-popups-settings .okay' ).show();
-			mw.track( 'ext.popups.schemaPopups', $.extend( {}, currentLinkLogData, {
+			mw.track( 'ext.popups.event', $.extend( {}, currentLinkLogData, {
 				action: 'disabled'
 			} ) );
 		}
diff --git a/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js b/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
index 06604cd00..bd75005ee 100644
--- a/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
+++ b/resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js
@@ -31,7 +31,7 @@
 	 * @param {Object} event
 	 */
 	function logClickAction( event ) {
-		mw.track( 'ext.popups.schemaPopups', $.extend( {}, logData, {
+		mw.track( 'ext.popups.event', $.extend( {}, logData, {
 			action: mw.popups.getAction( event ),
 			totalInteractionTime: Math.round( mw.now() - logData.dwellStartTime )
 		} ) );
@@ -41,7 +41,7 @@
 	 * Logs when a popup is dismissed
 	 */
 	function logDismissAction() {
-		mw.track( 'ext.popups.schemaPopups', $.extend( {}, logData, {
+		mw.track( 'ext.popups.event', $.extend( {}, logData, {
 			action: 'dismissed',
 			totalInteractionTime: Math.round( mw.now() - logData.dwellStartTime )
 		} ) );
@@ -371,7 +371,7 @@
 		var $activeLink = getActiveLink();
 
 		if ( logData.dwellStartTime && logData.linkInteractionToken ) {
-			mw.track( 'ext.popups.schemaPopups', $.extend( {}, logData, {
+			mw.track( 'ext.popups.event', $.extend( {}, logData, {
 				action: 'dwelledButAbandoned',
 				totalInteractionTime: Math.round( mw.now() - logData.dwellStartTime )
 			} ) );
diff --git a/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js b/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
index afe31b3b0..635f602e9 100644
--- a/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
+++ b/resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js
@@ -8,7 +8,7 @@
 			mw.popups.schemaPopups.getDefaultValues()
 		);
 
-	mw.trackSubscribe( 'ext.popups.schemaPopups', function ( topic, data ) {
+	mw.trackSubscribe( 'ext.popups.event', function ( topic, data ) {
 		var shouldLog = true;
 
 		data = mw.popups.schemaPopups.getMassagedData( data );
diff --git a/resources/ext.popups.targets.desktopTarget/desktopTarget.js b/resources/ext.popups.targets.desktopTarget/desktopTarget.js
index 0002d0935..4b47d46fd 100644
--- a/resources/ext.popups.targets.desktopTarget/desktopTarget.js
+++ b/resources/ext.popups.targets.desktopTarget/desktopTarget.js
@@ -21,7 +21,7 @@
 		$this.off( 'mouseleave blur', onLinkAbandon );
 
 		if ( data.dwellStartTime && data.linkInteractionToken ) {
-			mw.track( 'ext.popups.schemaPopups', {
+			mw.track( 'ext.popups.event', {
 				pageTitleHover: $this.attr( 'title' ),
 				action: 'dwelledButAbandoned',
 				totalInteractionTime: Math.round( mw.now() - data.dwellStartTime ),
@@ -80,7 +80,7 @@
 
 		$this.off( 'click', onLinkClick );
 
-		mw.track( 'ext.popups.schemaPopups', {
+		mw.track( 'ext.popups.event', {
 			pageTitleHover: $this.attr( 'title' ),
 			action: action,
 			totalInteractionTime: Math.round( mw.now() - data.dwellStartTime ),
@@ -184,7 +184,7 @@
 			initPopups();
 		}
 
-		mw.track( 'ext.popups.schemaPopups', {
+		mw.track( 'ext.popups.event', {
 			action: 'pageLoaded',
 			hovercardsSuppressedByGadget: isNavigationPopupsGadgetEnabled()
 		} );