diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index b3112f4d1fb..78f08adf4d9 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -2371,12 +2371,12 @@ impl ScriptThread {
             WebDriverScriptCommand::GetTitle(reply) => {
                 webdriver_handlers::handle_get_title(&documents, pipeline_id, reply)
             },
-            WebDriverScriptCommand::SendKeysSetup(
+            WebDriverScriptCommand::WillSendKeys(
                 strict_file_interactability,
                 text,
                 element_id,
                 reply,
-            ) => webdriver_handlers::handle_send_keys_setup(
+            ) => webdriver_handlers::handle_will_send_keys(
                 &documents,
                 pipeline_id,
                 element_id,
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index f5dff837a45..2e46e726ced 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -834,7 +834,7 @@ pub(crate) fn handle_find_element_elements_tag_name(
         .unwrap();
 }
 
-pub(crate) fn handle_send_keys_setup(
+pub(crate) fn handle_will_send_keys(
     documents: &DocumentCollection,
     pipeline: PipelineId,
     element_id: String,
diff --git a/components/shared/embedder/webdriver.rs b/components/shared/embedder/webdriver.rs
index 1207182b3fa..0444001a2cd 100644
--- a/components/shared/embedder/webdriver.rs
+++ b/components/shared/embedder/webdriver.rs
@@ -160,7 +160,8 @@ pub enum WebDriverScriptCommand {
     IsEnabled(String, IpcSender<Result<bool, ErrorStatus>>),
     IsSelected(String, IpcSender<Result<bool, ErrorStatus>>),
     GetTitle(IpcSender<String>),
-    SendKeysSetup(bool, String, String, IpcSender<Result<bool, ErrorStatus>>),
+    /// Match the element type before sending the event for webdriver `element send keys`.
+    WillSendKeys(bool, String, String, IpcSender<Result<bool, ErrorStatus>>),
 }
 
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index 96051de37bd..3410c74cf7a 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -1617,7 +1617,7 @@ impl Handler {
 
         let (sender, receiver) = ipc::channel().unwrap();
 
-        let cmd = WebDriverScriptCommand::SendKeysSetup(
+        let cmd = WebDriverScriptCommand::WillSendKeys(
             self.session()?.strict_file_interactability,
             keys.text.to_string(),
             element.to_string(),
@@ -1630,7 +1630,7 @@ impl Handler {
 
         // TODO: distinguish the not found and not focusable cases
         // File input and non-typeable form control should have
-        // been handled in `webdriver_handler.rs`
+        // been handled in `webdriver_handler.rs`.
         if wait_for_script_response(receiver)?.map_err(|error| WebDriverError::new(error, ""))? {
             return Ok(WebDriverResponse::Void);
         }