diff --git a/Applications/PixelPaint/BucketTool.h b/Applications/PixelPaint/BucketTool.h
index e579edd5c0..0d17f0699d 100644
--- a/Applications/PixelPaint/BucketTool.h
+++ b/Applications/PixelPaint/BucketTool.h
@@ -35,7 +35,7 @@ public:
     BucketTool();
     virtual ~BucketTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
 
 private:
     virtual const char* class_name() const override { return "BucketTool"; }
diff --git a/Applications/PixelPaint/EllipseTool.h b/Applications/PixelPaint/EllipseTool.h
index 762862d692..8bf2d7689e 100644
--- a/Applications/PixelPaint/EllipseTool.h
+++ b/Applications/PixelPaint/EllipseTool.h
@@ -37,9 +37,9 @@ public:
     EllipseTool();
     virtual ~EllipseTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
diff --git a/Applications/PixelPaint/EraseTool.h b/Applications/PixelPaint/EraseTool.h
index 713c15d87c..c574bde90f 100644
--- a/Applications/PixelPaint/EraseTool.h
+++ b/Applications/PixelPaint/EraseTool.h
@@ -38,8 +38,8 @@ public:
     EraseTool();
     virtual ~EraseTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
 
 private:
diff --git a/Applications/PixelPaint/ImageEditor.cpp b/Applications/PixelPaint/ImageEditor.cpp
index 97a813675d..9c27fc438f 100644
--- a/Applications/PixelPaint/ImageEditor.cpp
+++ b/Applications/PixelPaint/ImageEditor.cpp
@@ -153,8 +153,8 @@ void ImageEditor::mousedown_event(GUI::MouseEvent& event)
         return;
 
     auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
-    auto original_event = event_with_pan_and_scale_applied(event);
-    m_active_tool->on_mousedown(*m_active_layer, layer_event, original_event);
+    auto image_event = event_with_pan_and_scale_applied(event);
+    m_active_tool->on_mousedown(*m_active_layer, layer_event, image_event);
 }
 
 void ImageEditor::mousemove_event(GUI::MouseEvent& event)
@@ -172,9 +172,9 @@ void ImageEditor::mousemove_event(GUI::MouseEvent& event)
     if (!m_active_layer || !m_active_tool)
         return;
     auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
-    auto original_event = event_with_pan_and_scale_applied(event);
+    auto image_event = event_with_pan_and_scale_applied(event);
 
-    m_active_tool->on_mousemove(*m_active_layer, layer_event, original_event);
+    m_active_tool->on_mousemove(*m_active_layer, layer_event, image_event);
 }
 
 void ImageEditor::mouseup_event(GUI::MouseEvent& event)
@@ -182,8 +182,8 @@ void ImageEditor::mouseup_event(GUI::MouseEvent& event)
     if (!m_active_layer || !m_active_tool)
         return;
     auto layer_event = event_adjusted_for_layer(event, *m_active_layer);
-    auto original_event = event_with_pan_and_scale_applied(event);
-    m_active_tool->on_mouseup(*m_active_layer, layer_event, original_event);
+    auto image_event = event_with_pan_and_scale_applied(event);
+    m_active_tool->on_mouseup(*m_active_layer, layer_event, image_event);
 }
 
 void ImageEditor::mousewheel_event(GUI::MouseEvent& event)
diff --git a/Applications/PixelPaint/LineTool.h b/Applications/PixelPaint/LineTool.h
index 88a8d30e3e..306e3e1e5c 100644
--- a/Applications/PixelPaint/LineTool.h
+++ b/Applications/PixelPaint/LineTool.h
@@ -37,9 +37,9 @@ public:
     LineTool();
     virtual ~LineTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
diff --git a/Applications/PixelPaint/MoveTool.cpp b/Applications/PixelPaint/MoveTool.cpp
index 960dcc88d7..f52b407380 100644
--- a/Applications/PixelPaint/MoveTool.cpp
+++ b/Applications/PixelPaint/MoveTool.cpp
@@ -43,23 +43,23 @@ MoveTool::~MoveTool()
 {
 }
 
-void MoveTool::on_mousedown(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent& original_event)
+void MoveTool::on_mousedown(Layer& layer, GUI::MouseEvent& event, GUI::MouseEvent& image_event)
 {
     if (event.button() != GUI::MouseButton::Left)
         return;
     if (!layer.rect().contains(event.position()))
         return;
     m_layer_being_moved = layer;
-    m_event_origin = original_event.position();
+    m_event_origin = image_event.position();
     m_layer_origin = layer.location();
     m_editor->window()->set_override_cursor(GUI::StandardCursor::Move);
 }
 
-void MoveTool::on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent& original_event)
+void MoveTool::on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent& image_event)
 {
     if (!m_layer_being_moved)
         return;
-    auto delta = original_event.position() - m_event_origin;
+    auto delta = image_event.position() - m_event_origin;
     m_layer_being_moved->set_location(m_layer_origin.translated(delta));
     m_editor->layers_did_change();
 }
diff --git a/Applications/PixelPaint/MoveTool.h b/Applications/PixelPaint/MoveTool.h
index ff1c9d8e77..497795dc90 100644
--- a/Applications/PixelPaint/MoveTool.h
+++ b/Applications/PixelPaint/MoveTool.h
@@ -35,9 +35,9 @@ public:
     MoveTool();
     virtual ~MoveTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
     virtual void on_context_menu(Layer&, GUI::ContextMenuEvent&) override;
 
diff --git a/Applications/PixelPaint/PenTool.h b/Applications/PixelPaint/PenTool.h
index 86b717e8a5..85b718fe10 100644
--- a/Applications/PixelPaint/PenTool.h
+++ b/Applications/PixelPaint/PenTool.h
@@ -37,9 +37,9 @@ public:
     PenTool();
     virtual ~PenTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
 
 private:
diff --git a/Applications/PixelPaint/PickerTool.h b/Applications/PixelPaint/PickerTool.h
index a9d714879d..862810c79f 100644
--- a/Applications/PixelPaint/PickerTool.h
+++ b/Applications/PixelPaint/PickerTool.h
@@ -35,7 +35,7 @@ public:
     PickerTool();
     virtual ~PickerTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
 
 private:
     virtual const char* class_name() const override { return "PickerTool"; }
diff --git a/Applications/PixelPaint/RectangleTool.h b/Applications/PixelPaint/RectangleTool.h
index 63c8ec718f..00dd1f5839 100644
--- a/Applications/PixelPaint/RectangleTool.h
+++ b/Applications/PixelPaint/RectangleTool.h
@@ -37,9 +37,9 @@ public:
     RectangleTool();
     virtual ~RectangleTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
     virtual void on_second_paint(const Layer&, GUI::PaintEvent&) override;
     virtual void on_keydown(GUI::KeyEvent&) override;
diff --git a/Applications/PixelPaint/SprayTool.h b/Applications/PixelPaint/SprayTool.h
index c9dfb843fb..ab6309deb7 100644
--- a/Applications/PixelPaint/SprayTool.h
+++ b/Applications/PixelPaint/SprayTool.h
@@ -38,9 +38,9 @@ public:
     SprayTool();
     virtual ~SprayTool() override;
 
-    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
-    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& original_event) override;
+    virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mouseup(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
+    virtual void on_mousemove(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override;
     virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) override;
 
 private: