--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -5122,17 +5122,17 @@ PresShell::PaintRangePaintInfo(const nsT
     return nullptr;
   }
 
   RefPtr<gfxContext> ctx = gfxContext::CreateOrNull(dt);
   MOZ_ASSERT(ctx); // already checked the draw target above
 
   if (aRegion) {
     RefPtr<PathBuilder> builder = dt->CreatePathBuilder(FillRule::FILL_WINDING);
-    
+
     // Convert aRegion from CSS pixels to dev pixels
     nsIntRegion region =
       aRegion->ToAppUnits(nsPresContext::AppUnitsPerCSSPixel())
         .ToOutsidePixels(pc->AppUnitsPerDevPixel());
     for (auto iter = region.RectIter(); !iter.Done(); iter.Next()) {
       const nsIntRect& rect = iter.Get();
 
       builder->MoveTo(rect.TopLeft());
@@ -8066,36 +8066,34 @@ PresShell::HandleEventInternal(WidgetEve
           // valid user input for triggering popup, fullscreen, and
           // pointer lock.
           isHandlingUserInput = true;
           mPresContext->RecordInteractionTime(
             nsPresContext::InteractionType::eKeyInteraction,
             aEvent->mTimeStamp);
         }
 
-        Telemetry::AccumulateTimeDelta(Telemetry::KEYBOARD_EVENT_RECEIVED_MS, aEvent->mTimeStamp);
+        Telemetry::AccumulateTimeDelta(Telemetry::INPUT_EVENT_QUEUED_KEYBOARD_MS, aEvent->mTimeStamp);
         break;
       }
       case eMouseDown:
       case eMouseUp:
-        Telemetry::AccumulateTimeDelta(Telemetry::MOUSE_CLICK_EVENT_RECEIVED_MS, aEvent->mTimeStamp);
+        Telemetry::AccumulateTimeDelta(Telemetry::INPUT_EVENT_QUEUED_CLICK_MS, aEvent->mTimeStamp);
         MOZ_FALLTHROUGH;
       case ePointerDown:
       case ePointerUp:
         isHandlingUserInput = true;
         mPresContext->RecordInteractionTime(
           nsPresContext::InteractionType::eClickInteraction,
           aEvent->mTimeStamp);
         break;
 
       case eMouseMove:
         if (aEvent->mFlags.mHandledByAPZ) {
-          Telemetry::AccumulateTimeDelta(Telemetry::APZ_HANDLED_MOUSE_MOVE_EVENT_RECEIVED_MS, aEvent->mTimeStamp);
-        } else {
-          Telemetry::AccumulateTimeDelta(Telemetry::MOUSE_MOVE_EVENT_RECEIVED_MS, aEvent->mTimeStamp);
+          Telemetry::AccumulateTimeDelta(Telemetry::INPUT_EVENT_QUEUED_APZ_MOUSE_MOVE_MS, aEvent->mTimeStamp);
         }
         break;
 
       case eDrop: {
         nsCOMPtr<nsIDragSession> session = nsContentUtils::GetDragSession();
         if (session) {
           bool onlyChromeDrop = false;
           session->GetOnlyChromeDrop(&onlyChromeDrop);
@@ -8103,23 +8101,23 @@ PresShell::HandleEventInternal(WidgetEve
             aEvent->mFlags.mOnlyChromeDispatch = true;
           }
         }
         break;
       }
 
       case eWheel:
         if (aEvent->mFlags.mHandledByAPZ) {
-          Telemetry::AccumulateTimeDelta(Telemetry::APZ_HANDLED_WHEEL_EVENT_RECEIVED_MS, aEvent->mTimeStamp);
+          Telemetry::AccumulateTimeDelta(Telemetry::INPUT_EVENT_QUEUED_APZ_WHEEL_MS, aEvent->mTimeStamp);
         }
         break;
 
       case eTouchMove:
         if (aEvent->mFlags.mHandledByAPZ) {
-          Telemetry::AccumulateTimeDelta(Telemetry::APZ_HANDLED_TOUCH_MOVE_EVENT_RECEIVED_MS, aEvent->mTimeStamp);
+          Telemetry::AccumulateTimeDelta(Telemetry::INPUT_EVENT_QUEUED_APZ_TOUCH_MOVE_MS, aEvent->mTimeStamp);
         }
         break;
 
       default:
         break;
       }
 
       if (!mTouchManager.PreHandleEvent(aEvent, aStatus,

--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -11255,66 +11255,57 @@
     "bug_numbers": [1342635],
     "expires_in_version": "60",
     "kind": "exponential",
     "high": 500,
     "n_buckets": 20,
     "keyed": true,
     "description": "Measures the number of milliseconds we spend waiting on the main thread for IPC messages to serialize their parameters. Note: only messages that take more than 500 microseconds are included in this probe. This probe is keyed on the IPDL message name."
   },
-  "MOUSE_MOVE_EVENT_RECEIVED_MS": {
+  "INPUT_EVENT_QUEUED_CLICK_MS": {
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
-    "high": 50000,
-    "n_buckets": 100,
-    "bug_numbers": [1341531],
-    "description": "Time (ms) for the mouse move event to dispatch, but before handlers executing."
-  },
-  "MOUSE_CLICK_EVENT_RECEIVED_MS": {
-    "alert_emails": ["wpan@mozilla.com"],
-    "expires_in_version": "60",
-    "kind": "exponential",
-    "high": 50000,
+    "high": 5000,
     "n_buckets": 100,
     "bug_numbers": [1341531],
     "description": "Time (ms) for the mouse click event to dispatch, but before handlers executing."
   },
-  "KEYBOARD_EVENT_RECEIVED_MS": {
+  "INPUT_EVENT_QUEUED_KEYBOARD_MS": {
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
-    "high": 50000,
+    "high": 5000,
     "n_buckets": 100,
     "bug_numbers": [1341531],
     "description": "Time (ms) for the keyboard event to dispatch, but before handlers executing."
   },
-  "APZ_HANDLED_TOUCH_MOVE_EVENT_RECEIVED_MS": {
+  "INPUT_EVENT_QUEUED_APZ_TOUCH_MOVE_MS": {
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
-    "high": 50000,
+    "high": 5000,
     "n_buckets": 100,
     "bug_numbers": [1341531],
     "description": "Time (ms) for the APZ handled touch move event to dispatch, but before handlers executing."
   },
-  "APZ_HANDLED_MOUSE_MOVE_EVENT_RECEIVED_MS": {
+  "INPUT_EVENT_QUEUED_APZ_MOUSE_MOVE_MS": {
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
-    "high": 50000,
+    "high": 5000,
     "n_buckets": 100,
     "bug_numbers": [1341531],
     "description": "Time (ms) for the APZ handled mouse move event to dispatch, but before handlers executing."
   },
-  "APZ_HANDLED_WHEEL_EVENT_RECEIVED_MS": {
+  "INPUT_EVENT_QUEUED_APZ_WHEEL_MS": {
     "alert_emails": ["wpan@mozilla.com"],
     "expires_in_version": "60",
     "kind": "exponential",
-    "high": 50000,
+    "high": 5000,
     "n_buckets": 100,
     "bug_numbers": [1341531],
     "description": "Time (ms) for the APZ handled wheel event to dispatch, but before handlers executing."
   },
   "IPC_SYNC_MESSAGE_MANAGER_LATENCY_MS": {
     "alert_emails": ["michael@thelayzells.com"],
     "bug_numbers": [1348113],
     "expires_in_version": "60",