diff --git a/src/keyboard.rs b/src/keyboard.rs
index 42cff9ce0..0f969181a 100644
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@@ -460,8 +460,8 @@ pub fn event_type_to_event(event_type: EventType) -> Event {
         event_type,
         time: SystemTime::now(),
         unicode: None,
-        code: 0,
-        scan_code: 0,
+        platform_code: 0,
+        position_code: 0,
     }
 }
 
@@ -763,15 +763,15 @@ pub fn map_keyboard_mode(peer: &str, event: &Event, mut key_event: KeyEvent) ->
     };
     #[cfg(target_os = "linux")]
     let keycode = match peer {
-        OS_LOWER_WINDOWS => rdev::linux_code_to_win_scancode(event.code as _)?,
+        OS_LOWER_WINDOWS => rdev::linux_code_to_win_scancode(event.position_code as _)?,
         OS_LOWER_MACOS => {
             if hbb_common::config::LocalConfig::get_kb_layout_type() == "ISO" {
-                rdev::linux_code_to_macos_iso_code(event.code as _)?
+                rdev::linux_code_to_macos_iso_code(event.position_code as _)?
             } else {
-                rdev::linux_code_to_macos_code(event.code as _)?
+                rdev::linux_code_to_macos_code(event.position_code as _)?
             }
         }
-        _ => event.code as _,
+        _ => event.position_code as _,
     };
     #[cfg(any(target_os = "android", target_os = "ios"))]
     let keycode = 0;
diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs
index 2fd095347..8a1da6b8f 100644
--- a/src/ui_session_interface.rs
+++ b/src/ui_session_interface.rs
@@ -562,8 +562,8 @@ impl<T: InvokeUiSession> Session<T> {
         let event = Event {
             time: SystemTime::now(),
             unicode: None,
-            code: keycode as _,
-            scan_code: scancode as _,
+            platform_code: keycode as _,
+            position_code: scancode as _,
             event_type: event_type,
         };
         keyboard::client::process_event(&event, Some(lock_modes));