--- a/devtools/client/responsive.html/manager.js
+++ b/devtools/client/responsive.html/manager.js
@@ -528,17 +528,17 @@ ResponsiveUI.prototype = {
     ResponsiveUIManager.closeIfNeeded(browserWindow, tab);
   },
 
   onRemoveDeviceAssociation: Task.async(function* (event) {
     yield this.updateUserAgent();
     yield this.updateDPPX();
     yield this.updateTouchSimulation();
     // Used by tests
-    this.emit("device-removed");
+    this.emit("device-association-removed");
   }),
 
   updateDPPX: Task.async(function* (dppx) {
     if (!dppx) {
       yield this.emulationFront.clearDPPXOverride();
       return;
     }
     yield this.emulationFront.setDPPXOverride(dppx);

--- a/devtools/client/responsive.html/test/browser/browser_device_change.js
+++ b/devtools/client/responsive.html/test/browser/browser_device_change.js
@@ -45,17 +45,17 @@ addRDMTask(TEST_URL, function* ({ ui, ma
   // Test device with custom properties
   yield selectDevice(ui, "Fake Phone RDM Test");
   yield waitForViewportResizeTo(ui, testDevice.width, testDevice.height);
   yield testUserAgent(ui, testDevice.userAgent);
   yield testDevicePixelRatio(ui, testDevice.pixelRatio);
   yield testTouchEventsOverride(ui, true);
 
   // Test resetting device when resizing viewport
-  let deviceRemoved = once(ui, "device-removed");
+  let deviceRemoved = once(ui, "device-association-removed");
   yield testViewportResize(ui, ".viewport-vertical-resize-handle",
     [-10, -10], [testDevice.width, testDevice.height - 10], [0, -10], ui);
   yield deviceRemoved;
   yield testUserAgent(ui, DEFAULT_UA);
   yield testDevicePixelRatio(ui, DEFAULT_DPPX);
   yield testTouchEventsOverride(ui, false);
   testViewportDeviceSelectLabel(ui, "no device selected");
 

--- a/devtools/client/responsive.html/test/browser/browser_device_custom.js
+++ b/devtools/client/responsive.html/test/browser/browser_device_custom.js
@@ -101,17 +101,17 @@ addRDMTask(TEST_URL, function* ({ ui }) 
   testDeviceAdder(ui, Object.assign({}, device, {
     name: "Test Device (Custom)",
   }));
 
   info("Remove previously added custom device");
   let deviceRemoveButton = document.querySelector(".device-remove-button");
   let removed = Promise.all([
     waitUntilState(store, state => state.devices.custom.length == 0),
-    once(ui, "device-removed")
+    once(ui, "device-association-removed")
   ]);
   Simulate.click(deviceRemoveButton);
   yield removed;
   Simulate.click(submitButton);
 
   info("Ensure custom device was removed from device selector");
   yield waitUntilState(store, state => state.viewports[0].device == "");
   is(deviceSelector.value, "", "Device selector reset to no device");

--- a/devtools/client/responsive.html/test/browser/browser_dpr_change.js
+++ b/devtools/client/responsive.html/test/browser/browser_dpr_change.js
@@ -62,17 +62,17 @@ function* testChangingDevice(ui) {
   testViewportDeviceSelectLabel(ui, testDevice.name);
 }
 
 function* testResetWhenResizingViewport(ui) {
   info("Test reset when resizing the viewport");
 
   let waitPixelRatioChange = onceDevicePixelRatioChange(ui);
 
-  let deviceRemoved = once(ui, "device-removed");
+  let deviceRemoved = once(ui, "device-association-removed");
   yield testViewportResize(ui, ".viewport-vertical-resize-handle",
     [-10, -10], [testDevice.width, testDevice.height - 10], [0, -10], ui);
   yield deviceRemoved;
 
   yield waitPixelRatioChange;
   yield testDevicePixelRatio(ui, window.devicePixelRatio);
 
   testViewportDPRSelect(ui, {value: window.devicePixelRatio, disabled: false});

--- a/devtools/client/responsive.html/test/browser/browser_touch_device.js
+++ b/devtools/client/responsive.html/test/browser/browser_touch_device.js
@@ -57,17 +57,17 @@ function* testChangingDevice(ui) {
   testViewportDeviceSelectLabel(ui, testDevice.name);
 }
 
 function* testResizingViewport(ui, device, touch) {
   info(`Test resizing the viewport, device ${device}, touch ${touch}`);
 
   let deviceRemoved;
   if (device) {
-    deviceRemoved = once(ui, "device-removed");
+    deviceRemoved = once(ui, "device-association-removed");
   }
   yield testViewportResize(ui, ".viewport-vertical-resize-handle",
     [-10, -10], [testDevice.width, testDevice.height - 10], [0, -10], ui);
   if (device) {
     yield deviceRemoved;
   }
   yield testTouchEventsOverride(ui, touch);
   testViewportDeviceSelectLabel(ui, "no device selected");