diff --git a/build/wire.rs b/build/wire.rs
index 33d0b00a..48594f7f 100644
--- a/build/wire.rs
+++ b/build/wire.rs
@@ -243,12 +243,21 @@ struct Parser<'a> {
 impl<'a> Parser<'a> {
     fn parse(&mut self) -> Result<Vec<Lined<Message>>> {
         let mut res = vec![];
+        let mut requests = 0;
+        let mut events = 0;
         while !self.eof() {
             let (line, ty) = self.expect_ident()?;
-            match ty.as_bytes() {
-                b"msg" => res.push(self.parse_message()?),
+            let num = match ty.as_bytes() {
+                b"request" => &mut requests,
+                b"event" => &mut events,
                 _ => bail!("In line {}: Unexpected entry {:?}", line, ty),
+            };
+            let msg = self.parse_message()?;
+            if msg.val.id.val != *num {
+                bail!("{} != {}", msg.val.id.val, *num);
             }
+            *num += 1;
+            res.push(msg);
         }
         Ok(res)
     }
diff --git a/wire/ext_foreign_toplevel_handle_v1.txt b/wire/ext_foreign_toplevel_handle_v1.txt
index 423b2de9..c2ced2c6 100644
--- a/wire/ext_foreign_toplevel_handle_v1.txt
+++ b/wire/ext_foreign_toplevel_handle_v1.txt
@@ -1,24 +1,24 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
 # events
 
-msg closed = 0 {
+event closed = 0 {
 }
 
-msg done = 1 {
+event done = 1 {
 }
 
-msg title = 2 {
+event title = 2 {
     title: str,
 }
 
-msg app_id = 3 {
+event app_id = 3 {
     app_id: str,
 }
 
-msg identifier = 4 {
+event identifier = 4 {
     identifier: str,
 }
diff --git a/wire/ext_foreign_toplevel_list_v1.txt b/wire/ext_foreign_toplevel_list_v1.txt
index 45b260b0..542cd6fc 100644
--- a/wire/ext_foreign_toplevel_list_v1.txt
+++ b/wire/ext_foreign_toplevel_list_v1.txt
@@ -1,16 +1,16 @@
 # requests
 
-msg stop = 0 {
+request stop = 0 {
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 }
 
 # events
 
-msg toplevel = 0 {
+event toplevel = 0 {
     toplevel: id(ext_foreign_toplevel_handle_v1),
 }
 
-msg finished = 1 {
+event finished = 1 {
 }
diff --git a/wire/ext_idle_notification_v1.txt b/wire/ext_idle_notification_v1.txt
index c302edcc..c27e7421 100644
--- a/wire/ext_idle_notification_v1.txt
+++ b/wire/ext_idle_notification_v1.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
 # events
 
-msg idled = 0 {
+event idled = 0 {
 }
 
-msg resumed = 1 {
+event resumed = 1 {
 }
diff --git a/wire/ext_idle_notifier_v1.txt b/wire/ext_idle_notifier_v1.txt
index 2893149a..78aa784b 100644
--- a/wire/ext_idle_notifier_v1.txt
+++ b/wire/ext_idle_notifier_v1.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg get_idle_notification = 1 {
+request get_idle_notification = 1 {
     id: id(ext_idle_notification_v1),
     timeout: u32,
     seat: id(wl_seat),
diff --git a/wire/ext_session_lock_manager_v1.txt b/wire/ext_session_lock_manager_v1.txt
index 0236a45a..d8fded1b 100644
--- a/wire/ext_session_lock_manager_v1.txt
+++ b/wire/ext_session_lock_manager_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg lock = 1 {
+request lock = 1 {
     id: id(ext_session_lock_v1),
 }
diff --git a/wire/ext_session_lock_surface_v1.txt b/wire/ext_session_lock_surface_v1.txt
index df20adb1..a0092a26 100644
--- a/wire/ext_session_lock_surface_v1.txt
+++ b/wire/ext_session_lock_surface_v1.txt
@@ -1,16 +1,16 @@
 # request
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg ack_configure = 1 {
+request ack_configure = 1 {
     serial: u32,
 }
 
 # events
 
-msg configure = 0 {
+event configure = 0 {
     serial: u32,
     width: u32,
     height: u32,
diff --git a/wire/ext_session_lock_v1.txt b/wire/ext_session_lock_v1.txt
index 633483b7..c59fcd12 100644
--- a/wire/ext_session_lock_v1.txt
+++ b/wire/ext_session_lock_v1.txt
@@ -1,25 +1,25 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_lock_surface = 1 {
+request get_lock_surface = 1 {
     id: id(ext_session_lock_surface_v1),
     surface: id(wl_surface),
     output: id(wl_output),
 }
 
-msg unlock_and_destroy = 2 {
+request unlock_and_destroy = 2 {
 
 }
 
 # events
 
-msg locked = 0 {
+event locked = 0 {
 
 }
 
-msg finished = 1 {
+event finished = 1 {
 
 }
diff --git a/wire/jay_compositor.txt b/wire/jay_compositor.txt
index 03fc2ebf..e21e078c 100644
--- a/wire/jay_compositor.txt
+++ b/wire/jay_compositor.txt
@@ -1,90 +1,90 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_log_file = 1 {
+request get_log_file = 1 {
     id: id(jay_log_file),
 }
 
-msg quit = 2 {
+request quit = 2 {
 }
 
-msg set_log_level = 3 {
+request set_log_level = 3 {
     level: u32,
 }
 
-msg take_screenshot = 4 {
+request take_screenshot = 4 {
     id: id(jay_screenshot),
 }
 
-msg get_idle = 5 {
+request get_idle = 5 {
     id: id(jay_idle),
 }
 
-msg get_client_id = 6 {
+request get_client_id = 6 {
 
 }
 
-msg enable_symmetric_delete = 7 {
+request enable_symmetric_delete = 7 {
 
 }
 
-msg unlock = 8 {
+request unlock = 8 {
 
 }
 
-msg get_seats = 9 {
+request get_seats = 9 {
 
 }
 
-msg seat_events = 10 {
+request seat_events = 10 {
     id: id(jay_seat_events),
 }
 
-msg get_output = 11 {
+request get_output = 11 {
     id: id(jay_output),
     output: id(wl_output),
 }
 
-msg get_pointer = 12 {
+request get_pointer = 12 {
     id: id(jay_pointer),
     seat: id(wl_seat),
 }
 
-msg get_render_ctx = 13 {
+request get_render_ctx = 13 {
     id: id(jay_render_ctx),
 }
 
-msg watch_workspaces = 14 {
+request watch_workspaces = 14 {
     id: id(jay_workspace_watcher),
 }
 
-msg create_screencast = 15 {
+request create_screencast = 15 {
     id: id(jay_screencast),
 }
 
-msg get_randr = 16 {
+request get_randr = 16 {
     id: id(jay_randr),
 }
 
-msg get_input = 17 {
+request get_input = 17 {
     id: id(jay_input),
 }
 
-msg take_screenshot2 = 18 {
+request take_screenshot2 = 18 {
     id: id(jay_screenshot),
     include_cursor: u32,
 }
 
 # events
 
-msg client_id = 0 {
+event client_id = 0 {
     client_id: pod(u64),
 }
 
-msg seat = 1 {
+event seat = 1 {
     id: u32,
     name: str,
 }
diff --git a/wire/jay_idle.txt b/wire/jay_idle.txt
index a8a547f4..a9a90a9f 100644
--- a/wire/jay_idle.txt
+++ b/wire/jay_idle.txt
@@ -1,19 +1,19 @@
 # requests
 
-msg get_status = 0 {
+request get_status = 0 {
 }
 
-msg set_interval = 1 {
+request set_interval = 1 {
     interval: pod(u64),
 }
 
 # events
 
-msg interval = 0 {
+event interval = 0 {
     interval: pod(u64),
 }
 
-msg inhibitor = 1 {
+event inhibitor = 1 {
     surface: id(wl_surface),
     client_id: pod(u64),
     pid: pod(u64),
diff --git a/wire/jay_input.txt b/wire/jay_input.txt
index f083c743..355fbf91 100644
--- a/wire/jay_input.txt
+++ b/wire/jay_input.txt
@@ -1,75 +1,75 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_all = 1 {
+request get_all = 1 {
 
 }
 
-msg set_repeat_rate = 2 {
+request set_repeat_rate = 2 {
     seat: str,
     repeat_rate: i32,
     repeat_delay: i32,
 }
 
-msg set_keymap = 3 {
+request set_keymap = 3 {
     seat: str,
     keymap: fd,
     keymap_len: u32,
 }
 
-msg use_hardware_cursor = 4 {
+request use_hardware_cursor = 4 {
     seat: str,
     use_hardware_cursor: u32,
 }
 
-msg get_keymap = 5 {
+request get_keymap = 5 {
     seat: str,
 }
 
-msg set_accel_profile = 6 {
+request set_accel_profile = 6 {
     id: u32,
     profile: i32,
 }
 
-msg set_accel_speed = 7 {
+request set_accel_speed = 7 {
     id: u32,
     speed: pod(f64),
 }
 
-msg set_tap_enabled = 8 {
+request set_tap_enabled = 8 {
     id: u32,
     enabled: u32,
 }
 
-msg set_tap_drag_enabled = 9 {
+request set_tap_drag_enabled = 9 {
     id: u32,
     enabled: u32,
 }
 
-msg set_tap_drag_lock_enabled = 10 {
+request set_tap_drag_lock_enabled = 10 {
     id: u32,
     enabled: u32,
 }
 
-msg set_left_handed = 11 {
+request set_left_handed = 11 {
     id: u32,
     enabled: u32,
 }
 
-msg set_natural_scrolling = 12 {
+request set_natural_scrolling = 12 {
     id: u32,
     enabled: u32,
 }
 
-msg set_px_per_wheel_scroll = 13 {
+request set_px_per_wheel_scroll = 13 {
     id: u32,
     px: pod(f64),
 }
 
-msg set_transform_matrix = 14 {
+request set_transform_matrix = 14 {
     id: u32,
     m11: pod(f64),
     m12: pod(f64),
@@ -77,38 +77,38 @@ msg set_transform_matrix = 14 {
     m22: pod(f64),
 }
 
-msg set_cursor_size = 15 {
+request set_cursor_size = 15 {
     seat: str,
     size: u32,
 }
 
-msg attach = 16 {
+request attach = 16 {
     id: u32,
     seat: str,
 }
 
-msg detach = 17 {
+request detach = 17 {
     id: u32,
 }
 
-msg get_seat = 18 {
+request get_seat = 18 {
     name: str,
 }
 
-msg get_device = 19 {
+request get_device = 19 {
     id: u32,
 }
 
 # events
 
-msg seat = 0 {
+event seat = 0 {
     name: str,
     repeat_rate: i32,
     repeat_delay: i32,
     hardware_cursor: u32,
 }
 
-msg input_device = 1 {
+event input_device = 1 {
     id: u32,
     name: str,
     seat: str,
@@ -130,11 +130,11 @@ msg input_device = 1 {
     transform_matrix: array(pod(u8)),
 }
 
-msg error = 2 {
+event error = 2 {
     msg: str,
 }
 
-msg keymap = 3 {
+event keymap = 3 {
     keymap: fd,
     keymap_len: u32,
 }
diff --git a/wire/jay_log_file.txt b/wire/jay_log_file.txt
index 87ffde49..0aa3083d 100644
--- a/wire/jay_log_file.txt
+++ b/wire/jay_log_file.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
 # events
 
-msg path = 0 {
+event path = 0 {
     path: bstr,
 }
diff --git a/wire/jay_output.txt b/wire/jay_output.txt
index 640c87ed..e7827ea0 100644
--- a/wire/jay_output.txt
+++ b/wire/jay_output.txt
@@ -1,19 +1,19 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg linear_id = 0 {
+event linear_id = 0 {
     linear_id: u32,
 }
 
-msg unused = 1 {
+event unused = 1 {
 
 }
 
-msg destroyed = 2 {
+event destroyed = 2 {
 
 }
diff --git a/wire/jay_pointer.txt b/wire/jay_pointer.txt
index a4d81561..95c621dd 100644
--- a/wire/jay_pointer.txt
+++ b/wire/jay_pointer.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg set_known_cursor = 1 {
+request set_known_cursor = 1 {
     idx: u32,
 }
diff --git a/wire/jay_randr.txt b/wire/jay_randr.txt
index e51295b6..e9b2b0e7 100644
--- a/wire/jay_randr.txt
+++ b/wire/jay_randr.txt
@@ -1,62 +1,62 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get = 1 {
+request get = 1 {
 
 }
 
-msg set_api = 2 {
+request set_api = 2 {
     dev: str,
     api: str,
 }
 
-msg make_render_device = 3 {
+request make_render_device = 3 {
     dev: str,
 }
 
-msg set_direct_scanout = 4 {
+request set_direct_scanout = 4 {
     dev: str,
     enabled: u32,
 }
 
-msg set_transform = 5 {
+request set_transform = 5 {
     output: str,
     transform: i32,
 }
 
-msg set_scale = 6 {
+request set_scale = 6 {
     output: str,
     scale: u32,
 }
 
-msg set_mode = 7 {
+request set_mode = 7 {
     output: str,
     width: i32,
     height: i32,
     refresh_rate_millihz: u32,
 }
 
-msg set_position = 8 {
+request set_position = 8 {
     output: str,
     x: i32,
     y: i32,
 }
 
-msg set_enabled = 9 {
+request set_enabled = 9 {
     output: str,
     enabled: u32,
 }
 
 # events
 
-msg global = 0 {
+event global = 0 {
     default_gfx_api: str,
 }
 
-msg drm_device = 1 {
+event drm_device = 1 {
     id: pod(u64),
     syspath: str,
     vendor: u32,
@@ -68,14 +68,14 @@ msg drm_device = 1 {
     render_device: u32,
 }
 
-msg connector = 2 {
+event connector = 2 {
     id: pod(u64),
     drm_device: pod(u64),
     name: str,
     enabled: u32,
 }
 
-msg output = 3 {
+event output = 3 {
     scale: u32,
     width: i32,
     height: i32,
@@ -89,13 +89,13 @@ msg output = 3 {
     height_mm: i32,
 }
 
-msg mode = 4 {
+event mode = 4 {
     width: i32,
     height: i32,
     refresh_rate_millihz: u32,
     current: u32,
 }
 
-msg error = 5 {
+event error = 5 {
     msg: str,
 }
diff --git a/wire/jay_render_ctx.txt b/wire/jay_render_ctx.txt
index da36d93b..50edfaa4 100644
--- a/wire/jay_render_ctx.txt
+++ b/wire/jay_render_ctx.txt
@@ -1,15 +1,15 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg no_device = 0 {
+event no_device = 0 {
 
 }
 
-msg device = 1 {
+event device = 1 {
     fd: fd,
 }
diff --git a/wire/jay_screencast.txt b/wire/jay_screencast.txt
index de1afe3d..a7b143dd 100644
--- a/wire/jay_screencast.txt
+++ b/wire/jay_screencast.txt
@@ -1,99 +1,99 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg set_output = 1 {
+request set_output = 1 {
     output: id(jay_output),
 }
 
-msg set_allow_all_workspaces = 2 {
+request set_allow_all_workspaces = 2 {
     allow_all: u32,
 }
 
-msg allow_workspace = 3 {
+request allow_workspace = 3 {
     workspace: id(jay_workspace),
 }
 
-msg touch_allowed_workspaces = 4 {
+request touch_allowed_workspaces = 4 {
 }
 
-msg set_use_linear_buffers = 5 {
+request set_use_linear_buffers = 5 {
     use_linear: u32,
 }
 
-msg set_running = 6 {
+request set_running = 6 {
     running: u32,
 }
 
-msg configure = 7 {
+request configure = 7 {
 
 }
 
-msg ack_buffers = 8 {
+request ack_buffers = 8 {
     serial: u32,
 }
 
-msg ack_config = 9 {
+request ack_config = 9 {
     serial: u32,
 }
 
-msg release_buffer = 10 {
+request release_buffer = 10 {
     idx: u32,
 }
 
 # events
 
-msg plane = 0 {
+event plane = 0 {
     fd: fd,
     offset: u32,
     stride: u32,
 }
 
-msg buffer = 1 {
+event buffer = 1 {
     format: u32,
     modifier: pod(u64),
     width: i32,
     height: i32,
 }
 
-msg buffers_done = 2 {
+event buffers_done = 2 {
     serial: u32,
 }
 
-msg ready = 3 {
+event ready = 3 {
     idx: u32,
 }
 
-msg destroyed = 4 {
+event destroyed = 4 {
 
 }
 
-msg missed_frame = 5 {
+event missed_frame = 5 {
 
 }
 
-msg config_output = 6 {
+event config_output = 6 {
     linear_id: u32,
 }
 
-msg config_allow_all_workspaces = 7 {
+event config_allow_all_workspaces = 7 {
     allow_all: u32,
 }
 
-msg config_allow_workspace = 8 {
+event config_allow_workspace = 8 {
     linear_id: u32,
 }
 
-msg config_use_linear_buffers = 9 {
+event config_use_linear_buffers = 9 {
     use_linear: u32,
 }
 
-msg config_running = 10 {
+event config_running = 10 {
     running: u32,
 }
 
-msg config_done = 11 {
+event config_done = 11 {
     serial: u32,
 }
diff --git a/wire/jay_screenshot.txt b/wire/jay_screenshot.txt
index 41cc34b8..e4fe62d2 100644
--- a/wire/jay_screenshot.txt
+++ b/wire/jay_screenshot.txt
@@ -1,6 +1,6 @@
 # events
 
-msg dmabuf = 0 {
+event dmabuf = 0 {
     drm_dev: fd,
     fd: fd,
     width: u32,
@@ -11,6 +11,6 @@ msg dmabuf = 0 {
     modifier_hi: u32,
 }
 
-msg error = 1 {
+event error = 1 {
     msg: str,
 }
diff --git a/wire/jay_seat_events.txt b/wire/jay_seat_events.txt
index 1b4febc2..f09b6b9d 100644
--- a/wire/jay_seat_events.txt
+++ b/wire/jay_seat_events.txt
@@ -1,20 +1,20 @@
 # events
 
-msg key = 0 {
+event key = 0 {
     seat: u32,
     time_usec: pod(u64),
     key: u32,
     state: u32,
 }
 
-msg pointer_abs = 1 {
+event pointer_abs = 1 {
     seat: u32,
     time_usec: pod(u64),
     x: fixed,
     y: fixed,
 }
 
-msg pointer_rel = 2 {
+event pointer_rel = 2 {
     seat: u32,
     time_usec: pod(u64),
     x: fixed,
@@ -25,47 +25,47 @@ msg pointer_rel = 2 {
     dy_unaccelerated: fixed,
 }
 
-msg button = 3 {
+event button = 3 {
     seat: u32,
     time_usec: pod(u64),
     button: u32,
     state: u32,
 }
 
-msg unused = 4 {
+event unused = 4 {
 
 }
 
-msg axis_source = 5 {
+event axis_source = 5 {
     source: u32,
 }
 
-msg axis_px = 6 {
+event axis_px = 6 {
     dist: fixed,
     axis: u32,
 }
 
-msg axis_stop = 7 {
+event axis_stop = 7 {
     axis: u32,
 }
 
-msg axis_120 = 8 {
+event axis_120 = 8 {
     dist: i32,
     axis: u32,
 }
 
-msg axis_frame = 9 {
+event axis_frame = 9 {
     seat: u32,
     time_usec: pod(u64),
 }
 
-msg modifiers = 10 {
+event modifiers = 10 {
     seat: u32,
     modifiers: u32,
     group: u32,
 }
 
-msg axis_inverted = 11 {
+event axis_inverted = 11 {
     inverted: u32,
     axis: u32,
 }
diff --git a/wire/jay_workspace.txt b/wire/jay_workspace.txt
index 0575531b..27f622bb 100644
--- a/wire/jay_workspace.txt
+++ b/wire/jay_workspace.txt
@@ -1,31 +1,31 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg linear_id = 0 {
+event linear_id = 0 {
     linear_id: u32,
 }
 
-msg name = 1 {
+event name = 1 {
     name: str,
 }
 
-msg destroyed = 2 {
+event destroyed = 2 {
 
 }
 
-msg done = 3 {
+event done = 3 {
 
 }
 
-msg output = 4 {
+event output = 4 {
     global_name: u32,
 }
 
-msg visible = 5 {
+event visible = 5 {
     visible: u32,
 }
diff --git a/wire/jay_workspace_watcher.txt b/wire/jay_workspace_watcher.txt
index dcc9dc94..925cf5b3 100644
--- a/wire/jay_workspace_watcher.txt
+++ b/wire/jay_workspace_watcher.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg new = 0 {
+event new = 0 {
     id: id(jay_workspace),
     linear_id: u32,
 }
diff --git a/wire/org_kde_kwin_server_decoration.txt b/wire/org_kde_kwin_server_decoration.txt
index 2e083bf2..042ee954 100644
--- a/wire/org_kde_kwin_server_decoration.txt
+++ b/wire/org_kde_kwin_server_decoration.txt
@@ -1,15 +1,15 @@
 # requests
 
-msg release = 0 {
+request release = 0 {
 
 }
 
-msg request_mode = 1 {
+request request_mode = 1 {
     mode: u32,
 }
 
 # events
 
-msg mode = 0 {
+event mode = 0 {
     mode: u32,
 }
diff --git a/wire/org_kde_kwin_server_decoration_manager.txt b/wire/org_kde_kwin_server_decoration_manager.txt
index 6919d214..58dc405d 100644
--- a/wire/org_kde_kwin_server_decoration_manager.txt
+++ b/wire/org_kde_kwin_server_decoration_manager.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg create = 0 {
+request create = 0 {
     id: id(org_kde_kwin_server_decoration),
     surface: id(wl_surface),
 }
 
 # events
 
-msg default_mode = 0 {
+event default_mode = 0 {
     mode: u32,
 }
diff --git a/wire/wl_buffer.txt b/wire/wl_buffer.txt
index b7a5ca52..c37e0471 100644
--- a/wire/wl_buffer.txt
+++ b/wire/wl_buffer.txt
@@ -1,11 +1,11 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg release = 0 {
+event release = 0 {
 
 }
diff --git a/wire/wl_callback.txt b/wire/wl_callback.txt
index cd661540..d19ef7ab 100644
--- a/wire/wl_callback.txt
+++ b/wire/wl_callback.txt
@@ -1,5 +1,5 @@
 # events
 
-msg done = 0 {
+event done = 0 {
     callback_data: u32,
 }
diff --git a/wire/wl_compositor.txt b/wire/wl_compositor.txt
index 1165960e..411d7432 100644
--- a/wire/wl_compositor.txt
+++ b/wire/wl_compositor.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg create_surface = 0 {
+request create_surface = 0 {
     id: id(wl_surface),
 }
 
-msg create_region = 1 {
+request create_region = 1 {
     id: id(wl_region),
 }
diff --git a/wire/wl_data_device.txt b/wire/wl_data_device.txt
index d187b537..06ee4099 100644
--- a/wire/wl_data_device.txt
+++ b/wire/wl_data_device.txt
@@ -1,28 +1,28 @@
 # requests
 
-msg start_drag = 0 {
+request start_drag = 0 {
     source: id(wl_data_source),
     origin: id(wl_surface),
     icon: id(wl_surface),
     serial: u32,
 }
 
-msg set_selection = 1 {
+request set_selection = 1 {
     source: id(wl_data_source),
     serial: u32,
 }
 
-msg release = 2 {
+request release = 2 {
 
 }
 
 # events
 
-msg data_offer = 0 {
+event data_offer = 0 {
     id: id(wl_data_offer),
 }
 
-msg enter = 1 {
+event enter = 1 {
     serial: u32,
     surface: id(wl_surface),
     x: fixed,
@@ -30,20 +30,20 @@ msg enter = 1 {
     id: id(wl_data_offer),
 }
 
-msg leave = 2 {
+event leave = 2 {
 
 }
 
-msg motion = 3 {
+event motion = 3 {
     time: u32,
     x: fixed,
     y: fixed,
 }
 
-msg drop = 4 {
+event drop = 4 {
 
 }
 
-msg selection = 5 {
+event selection = 5 {
     id: id(wl_data_offer),
 }
diff --git a/wire/wl_data_device_manager.txt b/wire/wl_data_device_manager.txt
index 24e5d883..eb0a7f56 100644
--- a/wire/wl_data_device_manager.txt
+++ b/wire/wl_data_device_manager.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg create_data_source = 0 {
+request create_data_source = 0 {
     id: id(wl_data_source),
 }
 
-msg get_data_device = 1 {
+request get_data_device = 1 {
     id: id(wl_data_device),
     seat: id(wl_seat),
 }
diff --git a/wire/wl_data_offer.txt b/wire/wl_data_offer.txt
index a9667105..6de76c9b 100644
--- a/wire/wl_data_offer.txt
+++ b/wire/wl_data_offer.txt
@@ -1,36 +1,36 @@
 # requests
 
-msg accept = 0 {
+request accept = 0 {
     serial: u32,
     mime_type: optstr,
 }
 
-msg receive = 1 {
+request receive = 1 {
     mime_type: str,
     fd: fd,
 }
 
-msg destroy = 2 {
+request destroy = 2 {
 }
 
-msg finish = 3 {
+request finish = 3 {
 }
 
-msg set_actions = 4 {
+request set_actions = 4 {
     dnd_actions: u32,
     preferred_action: u32,
 }
 
 # events
 
-msg offer = 0 {
+event offer = 0 {
     mime_type: str,
 }
 
-msg source_actions = 1 {
+event source_actions = 1 {
     source_actions: u32,
 }
 
-msg action = 2 {
+event action = 2 {
     dnd_action: u32,
 }
diff --git a/wire/wl_data_source.txt b/wire/wl_data_source.txt
index bce10863..3d265698 100644
--- a/wire/wl_data_source.txt
+++ b/wire/wl_data_source.txt
@@ -1,40 +1,40 @@
 # requests
 
-msg offer = 0 {
+request offer = 0 {
     mime_type: str,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 
 }
 
-msg set_actions = 2 {
+request set_actions = 2 {
     dnd_actions: u32,
 }
 
 # events
 
-msg target = 0 {
+event target = 0 {
     mime_type: optstr,
 }
 
-msg send = 1 {
+event send = 1 {
     mime_type: str,
     fd: fd,
 }
 
-msg cancelled = 2 {
+event cancelled = 2 {
 
 }
 
-msg dnd_drop_performed = 3 {
+event dnd_drop_performed = 3 {
 
 }
 
-msg dnd_finished = 4 {
+event dnd_finished = 4 {
 
 }
 
-msg action = 5 {
+event action = 5 {
     dnd_action: u32,
 }
diff --git a/wire/wl_display.txt b/wire/wl_display.txt
index cb7971fc..e4b37c57 100644
--- a/wire/wl_display.txt
+++ b/wire/wl_display.txt
@@ -1,21 +1,21 @@
 # requests
 
-msg sync = 0 {
+request sync = 0 {
     callback: id(wl_callback),
 }
 
-msg get_registry = 1 {
+request get_registry = 1 {
     registry: id(wl_registry),
 }
 
 # events
 
-msg error = 0 {
+event error = 0 {
     object_id: id(object),
     code: u32,
     message: str,
 }
 
-msg delete_id = 1 {
+event delete_id = 1 {
     id: u32,
 }
diff --git a/wire/wl_drm.txt b/wire/wl_drm.txt
index 7290e2f4..de914db5 100644
--- a/wire/wl_drm.txt
+++ b/wire/wl_drm.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg authenticate = 0 {
+request authenticate = 0 {
     id: u32,
 }
 
-msg create_buffer = 1 {
+request create_buffer = 1 {
     id: id(wl_buffer),
     name: u32,
     width: i32,
@@ -13,7 +13,7 @@ msg create_buffer = 1 {
     format: u32,
 }
 
-msg create_planar_buffer = 2 {
+request create_planar_buffer = 2 {
     id: id(wl_buffer),
     name:    u32,
     width:   i32,
@@ -27,7 +27,7 @@ msg create_planar_buffer = 2 {
     stride2: i32,
 }
 
-msg create_prime_buffer = 3 {
+request create_prime_buffer = 3 {
     id: id(wl_buffer),
     name: fd,
     width    : i32,
@@ -43,18 +43,18 @@ msg create_prime_buffer = 3 {
 
 # events
 
-msg device = 0 {
+event device = 0 {
     name: bstr,
 }
 
-msg format = 1 {
+event format = 1 {
     format: u32,
 }
 
-msg authenticated = 2 {
+event authenticated = 2 {
 
 }
 
-msg capabilities = 3 {
+event capabilities = 3 {
     value: u32,
 }
diff --git a/wire/wl_keyboard.txt b/wire/wl_keyboard.txt
index a2d138fb..7cde4996 100644
--- a/wire/wl_keyboard.txt
+++ b/wire/wl_keyboard.txt
@@ -1,36 +1,36 @@
 # requests
 
-msg release = 0 {
+request release = 0 {
 
 }
 
 # events
 
-msg keymap = 0 {
+event keymap = 0 {
     format: u32,
     fd: fd,
     size: u32,
 }
 
-msg enter = 1 {
+event enter = 1 {
     serial: u32,
     surface: id(wl_surface),
     keys: array(u32),
 }
 
-msg leave = 2 {
+event leave = 2 {
     serial: u32,
     surface: id(wl_surface),
 }
 
-msg key = 3 {
+event key = 3 {
     serial: u32,
     time: u32,
     key: u32,
     state: u32,
 }
 
-msg modifiers = 4 {
+event modifiers = 4 {
     serial: u32,
     mods_depressed: u32,
     mods_latched: u32,
@@ -38,7 +38,7 @@ msg modifiers = 4 {
     group: u32,
 }
 
-msg repeat_info = 5 {
+event repeat_info = 5 {
     rate: i32,
     delay: i32,
 }
diff --git a/wire/wl_output.txt b/wire/wl_output.txt
index fca84aa6..928893c4 100644
--- a/wire/wl_output.txt
+++ b/wire/wl_output.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg release = 0 {
+request release = 0 {
 
 }
 
 # events
 
-msg geometry = 0 {
+event geometry = 0 {
     x               : i32,
     y               : i32,
     physical_width  : i32,
@@ -17,25 +17,25 @@ msg geometry = 0 {
     transform       : i32,
 }
 
-msg mode = 1 {
+event mode = 1 {
     flags    : u32,
     width    : i32,
     height   : i32,
     refresh  : i32,
 }
 
-msg done = 2 {
+event done = 2 {
 
 }
 
-msg scale = 3 {
+event scale = 3 {
     factor: i32,
 }
 
-msg name = 4 {
+event name = 4 {
     name: str,
 }
 
-msg description = 5 {
+event description = 5 {
     description: str,
 }
diff --git a/wire/wl_pointer.txt b/wire/wl_pointer.txt
index f564c293..5141d7fd 100644
--- a/wire/wl_pointer.txt
+++ b/wire/wl_pointer.txt
@@ -1,73 +1,73 @@
 # requests
 
-msg set_cursor = 0 {
+request set_cursor = 0 {
     serial: u32,
     surface: id(wl_surface),
     hotspot_x: i32,
     hotspot_y: i32,
 }
 
-msg release = 1 {
+request release = 1 {
 
 }
 
 # events
 
-msg enter = 0 {
+event enter = 0 {
     serial: u32,
     surface: id(wl_surface),
     surface_x: fixed,
     surface_y: fixed,
 }
 
-msg leave = 1 {
+event leave = 1 {
     serial: u32,
     surface: id(wl_surface),
 }
 
-msg motion = 2 {
+event motion = 2 {
     time: u32,
     surface_x: fixed,
     surface_y: fixed,
 }
 
-msg button = 3 {
+event button = 3 {
     serial: u32,
     time: u32,
     button: u32,
     state: u32,
 }
 
-msg axis = 4 {
+event axis = 4 {
     time: u32,
     axis: u32,
     value: fixed,
 }
 
-msg frame = 5 {
+event frame = 5 {
 
 }
 
-msg axis_source = 6 {
+event axis_source = 6 {
     axis_source: u32,
 }
 
-msg axis_stop = 7 {
+event axis_stop = 7 {
     time: u32,
     axis: u32,
 }
 
-msg axis_discrete = 8 {
+event axis_discrete = 8 {
     axis: u32,
     discrete: i32,
 }
 
-msg axis_value120 = 9 {
+event axis_value120 = 9 {
     axis: u32,
     value120: i32,
 }
 
-msg axis_relative_direction = 10 {
+event axis_relative_direction = 10 {
     axis: u32,
     direction: u32,
 }
diff --git a/wire/wl_region.txt b/wire/wl_region.txt
index efa74ccd..67f9ea08 100644
--- a/wire/wl_region.txt
+++ b/wire/wl_region.txt
@@ -1,17 +1,17 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg add = 1 {
+request add = 1 {
     x: i32,
     y: i32,
     width: i32,
     height: i32,
 }
 
-msg subtract = 2 {
+request subtract = 2 {
     x: i32,
     y: i32,
     width: i32,
diff --git a/wire/wl_registry.txt b/wire/wl_registry.txt
index c34c0905..839aa0e2 100644
--- a/wire/wl_registry.txt
+++ b/wire/wl_registry.txt
@@ -1,6 +1,6 @@
 # requests
 
-msg bind = 0 {
+request bind = 0 {
     name: u32,
     interface: str,
     version: u32,
@@ -9,12 +9,12 @@ msg bind = 0 {
 
 # events
 
-msg global = 0 {
+event global = 0 {
     name: u32,
     interface: str,
     version: u32,
 }
 
-msg global_remove = 1 {
+event global_remove = 1 {
     name: u32,
 }
diff --git a/wire/wl_seat.txt b/wire/wl_seat.txt
index 053e95ef..f0e0f77f 100644
--- a/wire/wl_seat.txt
+++ b/wire/wl_seat.txt
@@ -1,26 +1,26 @@
 # requests
 
-msg get_pointer = 0 {
+request get_pointer = 0 {
     id: id(wl_pointer),
 }
 
-msg get_keyboard = 1 {
+request get_keyboard = 1 {
     id: id(wl_keyboard),
 }
 
-msg get_touch = 2 {
+request get_touch = 2 {
     id: id(wl_touch),
 }
 
-msg release = 3 {
+request release = 3 {
 }
 
 # events
 
-msg capabilities = 0 {
+event capabilities = 0 {
     capabilities: u32,
 }
 
-msg name = 1 {
+event name = 1 {
     name: str,
 }
diff --git a/wire/wl_shm.txt b/wire/wl_shm.txt
index cc157ad3..2e3b0389 100644
--- a/wire/wl_shm.txt
+++ b/wire/wl_shm.txt
@@ -1,16 +1,16 @@
 # requests
 
-msg create_pool = 0 {
+request create_pool = 0 {
     id: id(wl_shm_pool),
     fd: fd,
     size: i32,
 }
 
-msg release = 1 {
+request release = 1 {
 }
 
 # events
 
-msg format = 0 {
+event format = 0 {
     format: u32,
 }
diff --git a/wire/wl_shm_pool.txt b/wire/wl_shm_pool.txt
index d2850ec6..46464c40 100644
--- a/wire/wl_shm_pool.txt
+++ b/wire/wl_shm_pool.txt
@@ -1,6 +1,6 @@
 # requests
 
-msg create_buffer = 0 {
+request create_buffer = 0 {
     id: id(wl_buffer),
     offset: i32,
     width: i32,
@@ -9,10 +9,10 @@ msg create_buffer = 0 {
     format: u32,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 
 }
 
-msg resize = 2 {
+request resize = 2 {
     size: i32,
 }
diff --git a/wire/wl_subcompositor.txt b/wire/wl_subcompositor.txt
index 97055f40..f1f851a1 100644
--- a/wire/wl_subcompositor.txt
+++ b/wire/wl_subcompositor.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_subsurface = 1 {
+request get_subsurface = 1 {
     id: id(wl_subsurface),
     surface: id(wl_surface),
     parent: id(wl_surface),
diff --git a/wire/wl_subsurface.txt b/wire/wl_subsurface.txt
index 5677fdaf..912ef074 100644
--- a/wire/wl_subsurface.txt
+++ b/wire/wl_subsurface.txt
@@ -1,20 +1,20 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg set_position = 1 {
+request set_position = 1 {
     x: i32,
     y: i32,
 }
 
-msg place_above = 2 {
+request place_above = 2 {
     sibling: id(wl_surface),
 }
 
-msg place_below = 3 {
+request place_below = 3 {
     sibling: id(wl_surface),
 }
 
-msg set_sync = 4 { }
+request set_sync = 4 { }
 
-msg set_desync = 5 { }
+request set_desync = 5 { }
diff --git a/wire/wl_surface.txt b/wire/wl_surface.txt
index 46b27eb0..58066083 100644
--- a/wire/wl_surface.txt
+++ b/wire/wl_surface.txt
@@ -1,70 +1,70 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg attach = 1 {
+request attach = 1 {
     buffer: id(wl_buffer),
     x: i32,
     y: i32,
 }
 
-msg damage = 2 {
+request damage = 2 {
     x: i32,
     y: i32,
     width: i32,
     height: i32,
 }
 
-msg frame = 3 {
+request frame = 3 {
     callback: id(wl_callback),
 }
 
-msg set_opaque_region = 4 {
+request set_opaque_region = 4 {
     region: id(wl_region),
 }
 
-msg set_input_region = 5 {
+request set_input_region = 5 {
     region: id(wl_region),
 }
 
-msg commit = 6 {
+request commit = 6 {
 }
 
-msg set_buffer_transform = 7 {
+request set_buffer_transform = 7 {
     transform: i32,
 }
 
-msg set_buffer_scale = 8 {
+request set_buffer_scale = 8 {
     scale: i32,
 }
 
-msg damage_buffer = 9 {
+request damage_buffer = 9 {
     x: i32,
     y: i32,
     width: i32,
     height: i32,
 }
 
-msg offset = 10 {
+request offset = 10 {
     x: i32,
     y: i32,
 }
 
 # events
 
-msg enter = 0 {
+event enter = 0 {
     output: id(wl_output),
 }
 
-msg leave = 1 {
+event leave = 1 {
     output: id(wl_output),
 }
 
-msg preferred_buffer_scale = 2 {
+event preferred_buffer_scale = 2 {
     factor: i32,
 }
 
-msg preferred_buffer_transform = 3 {
+event preferred_buffer_transform = 3 {
     transform: u32,
 }
diff --git a/wire/wl_touch.txt b/wire/wl_touch.txt
index f3834d9d..eda110fd 100644
--- a/wire/wl_touch.txt
+++ b/wire/wl_touch.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg release = 0 {
+request release = 0 {
 
 }
 
 # events
 
-msg down = 0 {
+event down = 0 {
     serial: u32,
     time: u32,
     surface: id(wl_surface),
@@ -15,34 +15,34 @@ msg down = 0 {
     y: fixed,
 }
 
-msg up = 1 {
+event up = 1 {
     serial: u32,
     time: u32,
     id: i32,
 }
 
-msg motion = 2 {
+event motion = 2 {
     time: u32,
     id: u32,
     x: fixed,
     y: fixed,
 }
 
-msg frame = 3 {
+event frame = 3 {
 
 }
 
-msg cancel = 4 {
+event cancel = 4 {
 
 }
 
-msg shape = 5 {
+event shape = 5 {
     id: i32,
     major: fixed,
     minor: fixed,
 }
 
-msg orientation = 6 {
+event orientation = 6 {
     id: i32,
     orientation: fixed,
 }
diff --git a/wire/wp_content_type_manager_v1.txt b/wire/wp_content_type_manager_v1.txt
index b70a0196..69026e19 100644
--- a/wire/wp_content_type_manager_v1.txt
+++ b/wire/wp_content_type_manager_v1.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg get_surface_content_type = 1 {
+request get_surface_content_type = 1 {
     id: id(wp_content_type_v1),
     surface: id(wl_surface),
 }
diff --git a/wire/wp_content_type_v1.txt b/wire/wp_content_type_v1.txt
index 59a64906..95f8a88e 100644
--- a/wire/wp_content_type_v1.txt
+++ b/wire/wp_content_type_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg set_content_type = 1 {
+request set_content_type = 1 {
     content_type: u32,
 }
diff --git a/wire/wp_cursor_shape_device_v1.txt b/wire/wp_cursor_shape_device_v1.txt
index d840af08..ad60d552 100644
--- a/wire/wp_cursor_shape_device_v1.txt
+++ b/wire/wp_cursor_shape_device_v1.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg set_shape = 1 {
+request set_shape = 1 {
     serial: u32,
     shape: u32,
 }
diff --git a/wire/wp_cursor_shape_manager_v1.txt b/wire/wp_cursor_shape_manager_v1.txt
index 769da728..33eec0f7 100644
--- a/wire/wp_cursor_shape_manager_v1.txt
+++ b/wire/wp_cursor_shape_manager_v1.txt
@@ -1,14 +1,14 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg get_pointer = 1 {
+request get_pointer = 1 {
     cursor_shape_device: id(wp_cursor_shape_device_v1),
     pointer: id(wl_pointer),
 }
 
-msg get_tablet_tool_v2 = 2 {
+request get_tablet_tool_v2 = 2 {
     cursor_shape_device: id(wp_cursor_shape_device_v1),
     tablet_tool: id(zwp_tablet_tool_v2),
 }
diff --git a/wire/wp_fractional_scale_manager_v1.txt b/wire/wp_fractional_scale_manager_v1.txt
index ebc3f450..7e024a07 100644
--- a/wire/wp_fractional_scale_manager_v1.txt
+++ b/wire/wp_fractional_scale_manager_v1.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_fractional_scale = 1 {
+request get_fractional_scale = 1 {
     id: id(wp_fractional_scale_v1),
     surface: id(wl_surface),
 }
diff --git a/wire/wp_fractional_scale_v1.txt b/wire/wp_fractional_scale_v1.txt
index 11fa69d4..1024a0a3 100644
--- a/wire/wp_fractional_scale_v1.txt
+++ b/wire/wp_fractional_scale_v1.txt
@@ -1,11 +1,11 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg preferred_scale = 0 {
+event preferred_scale = 0 {
     scale: u32,
 }
diff --git a/wire/wp_linux_drm_syncobj_manager_v1.txt b/wire/wp_linux_drm_syncobj_manager_v1.txt
index 2efc8de3..2e6274ce 100644
--- a/wire/wp_linux_drm_syncobj_manager_v1.txt
+++ b/wire/wp_linux_drm_syncobj_manager_v1.txt
@@ -1,15 +1,15 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_surface = 1 {
+request get_surface = 1 {
     id: id(wp_linux_drm_syncobj_surface_v1),
     surface: id(wl_surface),
 }
 
-msg import_timeline = 2 {
+request import_timeline = 2 {
     id: id(wp_linux_drm_syncobj_timeline_v1),
     fd: fd,
 }
diff --git a/wire/wp_linux_drm_syncobj_surface_v1.txt b/wire/wp_linux_drm_syncobj_surface_v1.txt
index 08cbcc23..7009854a 100644
--- a/wire/wp_linux_drm_syncobj_surface_v1.txt
+++ b/wire/wp_linux_drm_syncobj_surface_v1.txt
@@ -1,16 +1,16 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg set_acquire_point = 1 {
+request set_acquire_point = 1 {
     timeline: id(wp_linux_drm_syncobj_timeline_v1),
     point_hi: u32,
     point_lo: u32,
 }
 
-msg set_release_point = 2 {
+request set_release_point = 2 {
     timeline: id(wp_linux_drm_syncobj_timeline_v1),
     point_hi: u32,
     point_lo: u32,
diff --git a/wire/wp_linux_drm_syncobj_timeline_v1.txt b/wire/wp_linux_drm_syncobj_timeline_v1.txt
index 35dc4c51..d9a8833d 100644
--- a/wire/wp_linux_drm_syncobj_timeline_v1.txt
+++ b/wire/wp_linux_drm_syncobj_timeline_v1.txt
@@ -1,5 +1,5 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
diff --git a/wire/wp_presentation.txt b/wire/wp_presentation.txt
index 5685684c..7504bd73 100644
--- a/wire/wp_presentation.txt
+++ b/wire/wp_presentation.txt
@@ -1,15 +1,15 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg feedback = 1 {
+request feedback = 1 {
     surface: id(wl_surface),
     callback: id(wp_presentation_feedback),
 }
 
 # events
 
-msg clock_id = 0 {
+event clock_id = 0 {
     clk_id: u32,
 }
diff --git a/wire/wp_presentation_feedback.txt b/wire/wp_presentation_feedback.txt
index 0a8e34d9..67eac49f 100644
--- a/wire/wp_presentation_feedback.txt
+++ b/wire/wp_presentation_feedback.txt
@@ -1,10 +1,10 @@
 # events
 
-msg sync_output = 0 {
+event sync_output = 0 {
     output: id(wl_output),
 }
 
-msg presented = 1 {
+event presented = 1 {
     tv_sec_hi   : u32,
     tv_sec_lo   : u32,
     tv_nsec     : u32,
@@ -14,6 +14,6 @@ msg presented = 1 {
     flags       : u32,
 }
 
-msg discarded = 2 {
+event discarded = 2 {
 
 }
diff --git a/wire/wp_single_pixel_buffer_manager_v1.txt b/wire/wp_single_pixel_buffer_manager_v1.txt
index b6f508da..3cdc1633 100644
--- a/wire/wp_single_pixel_buffer_manager_v1.txt
+++ b/wire/wp_single_pixel_buffer_manager_v1.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg create_u32_rgba_buffer = 1 {
+request create_u32_rgba_buffer = 1 {
     id: id(wl_buffer),
     r: u32,
     g: u32,
diff --git a/wire/wp_tearing_control_manager_v1.txt b/wire/wp_tearing_control_manager_v1.txt
index 639d606f..6ac9adbd 100644
--- a/wire/wp_tearing_control_manager_v1.txt
+++ b/wire/wp_tearing_control_manager_v1.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_tearing_control = 1 {
+request get_tearing_control = 1 {
     id: id(wp_tearing_control_v1),
     surface: id(wl_surface),
 }
diff --git a/wire/wp_tearing_control_v1.txt b/wire/wp_tearing_control_v1.txt
index 6dcebc20..58e05d16 100644
--- a/wire/wp_tearing_control_v1.txt
+++ b/wire/wp_tearing_control_v1.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg set_presentation_hint = 0 {
+request set_presentation_hint = 0 {
     hint: u32,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 
 }
diff --git a/wire/wp_viewport.txt b/wire/wp_viewport.txt
index 3c90fd41..1b2fa15f 100644
--- a/wire/wp_viewport.txt
+++ b/wire/wp_viewport.txt
@@ -1,16 +1,16 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg set_source = 1 {
+request set_source = 1 {
     x: fixed,
     y: fixed,
     width: fixed,
     height: fixed,
 }
 
-msg set_destination = 2 {
+request set_destination = 2 {
     width: i32,
     height: i32,
 }
diff --git a/wire/wp_viewporter.txt b/wire/wp_viewporter.txt
index 6f9012a1..5df53123 100644
--- a/wire/wp_viewporter.txt
+++ b/wire/wp_viewporter.txt
@@ -1,9 +1,9 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg get_viewport = 1 {
+request get_viewport = 1 {
     id: id(wp_viewport),
     surface: id(wl_surface),
 }
diff --git a/wire/xdg_activation_token_v1.txt b/wire/xdg_activation_token_v1.txt
index f9d3aeb9..684b510c 100644
--- a/wire/xdg_activation_token_v1.txt
+++ b/wire/xdg_activation_token_v1.txt
@@ -1,28 +1,28 @@
 # requests
 
-msg set_serial = 0 {
+request set_serial = 0 {
     serial: u32,
     seat: id(wl_seat),
 }
 
-msg set_app_id = 1 {
+request set_app_id = 1 {
     app_id: str,
 }
 
-msg set_surface = 2 {
+request set_surface = 2 {
     surface: id(wl_surface),
 }
 
-msg commit = 3 {
+request commit = 3 {
 
 }
 
-msg destroy = 4 {
+request destroy = 4 {
 
 }
 
 # events
 
-msg done = 0 {
+event done = 0 {
     token: str,
 }
diff --git a/wire/xdg_activation_v1.txt b/wire/xdg_activation_v1.txt
index 34a839ba..aa4c853a 100644
--- a/wire/xdg_activation_v1.txt
+++ b/wire/xdg_activation_v1.txt
@@ -1,14 +1,14 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_activation_token = 1 {
+request get_activation_token = 1 {
     id: id(xdg_activation_token_v1),
 }
 
-msg activate = 2 {
+request activate = 2 {
     token: str,
     surface: id(wl_surface),
 }
diff --git a/wire/xdg_popup.txt b/wire/xdg_popup.txt
index 038eabf5..9afbabe5 100644
--- a/wire/xdg_popup.txt
+++ b/wire/xdg_popup.txt
@@ -1,30 +1,30 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg grab = 1 {
+request grab = 1 {
     seat: id(wl_seat),
     serial: u32,
 }
 
-msg reposition = 2 {
+request reposition = 2 {
     positioner: id(xdg_positioner),
     token: u32,
 }
 
 # events
 
-msg configure = 0 {
+event configure = 0 {
     x: i32,
     y: i32,
     width: i32,
     height: i32,
 }
 
-msg popup_done = 1 {
+event popup_done = 1 {
 
 }
 
-msg repositioned = 2 {
+event repositioned = 2 {
     token: u32,
 }
diff --git a/wire/xdg_positioner.txt b/wire/xdg_positioner.txt
index 2b80f837..97a06bdc 100644
--- a/wire/xdg_positioner.txt
+++ b/wire/xdg_positioner.txt
@@ -1,45 +1,45 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg set_size = 1 {
+request set_size = 1 {
     width: i32,
     height: i32,
 }
 
-msg set_anchor_rect = 2 {
+request set_anchor_rect = 2 {
     x: i32,
     y: i32,
     width: i32,
     height: i32,
 }
 
-msg set_anchor = 3 {
+request set_anchor = 3 {
     anchor: u32,
 }
 
-msg set_gravity = 4 {
+request set_gravity = 4 {
     gravity: u32,
 }
 
-msg set_constraint_adjustment = 5 {
+request set_constraint_adjustment = 5 {
     constraint_adjustment: u32,
 }
 
-msg set_offset = 6 {
+request set_offset = 6 {
     x: i32,
     y: i32,
 }
 
-msg set_reactive = 7 {
+request set_reactive = 7 {
 
 }
 
-msg set_parent_size = 8 {
+request set_parent_size = 8 {
     parent_width: i32,
     parent_height: i32,
 }
 
-msg set_parent_configure = 9 {
+request set_parent_configure = 9 {
     serial: u32,
 }
diff --git a/wire/xdg_surface.txt b/wire/xdg_surface.txt
index 25e72973..15dba455 100644
--- a/wire/xdg_surface.txt
+++ b/wire/xdg_surface.txt
@@ -1,30 +1,30 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg get_toplevel = 1 {
+request get_toplevel = 1 {
     id: id(xdg_toplevel),
 }
 
-msg get_popup = 2 {
+request get_popup = 2 {
     id: id(xdg_popup),
     parent: id(xdg_surface),
     positioner: id(xdg_positioner),
 }
 
-msg set_window_geometry = 3 {
+request set_window_geometry = 3 {
     x: i32,
     y: i32,
     width: i32,
     height: i32,
 }
 
-msg ack_configure = 4 {
+request ack_configure = 4 {
     serial: u32,
 }
 
 # events
 
-msg configure = 0 {
+event configure = 0 {
     serial: u32,
 }
diff --git a/wire/xdg_toplevel.txt b/wire/xdg_toplevel.txt
index fdbbd70f..b4468031 100644
--- a/wire/xdg_toplevel.txt
+++ b/wire/xdg_toplevel.txt
@@ -1,78 +1,78 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg set_parent = 1 {
+request set_parent = 1 {
     parent: id(xdg_toplevel),
 }
 
-msg set_title = 2 {
+request set_title = 2 {
     title: str,
 }
 
-msg set_app_id = 3 {
+request set_app_id = 3 {
     app_id: str,
 }
 
-msg show_window_menu = 4 {
+request show_window_menu = 4 {
     seat: id(wl_seat),
     serial: u32,
     x: i32,
     y: i32,
 }
 
-msg move = 5 {
+request move = 5 {
     seat: id(wl_seat),
     serial: u32,
 }
 
-msg resize = 6 {
+request resize = 6 {
     seat: id(wl_seat),
     serial: u32,
     edges: u32,
 }
 
-msg set_max_size = 7 {
+request set_max_size = 7 {
     width: i32,
     height: i32,
 }
 
-msg set_min_size = 8 {
+request set_min_size = 8 {
     width: i32,
     height: i32,
 }
 
-msg set_maximized = 9 { }
+request set_maximized = 9 { }
 
-msg unset_maximized = 10 { }
+request unset_maximized = 10 { }
 
-msg set_fullscreen = 11 {
+request set_fullscreen = 11 {
     output: id(wl_output),
 }
 
-msg unset_fullscreen = 12 {
+request unset_fullscreen = 12 {
 
 }
 
-msg set_minimized = 13 { }
+request set_minimized = 13 { }
 
 # events
 
-msg configure = 0 {
+event configure = 0 {
     width: i32,
     height: i32,
     states: array(u32),
 }
 
-msg close = 1 { }
+event close = 1 { }
 
-msg configure_bounds = 2 {
+event configure_bounds = 2 {
     width: i32,
     height: i32,
 }
 
-msg wm_capabilities = 3 {
+event wm_capabilities = 3 {
     capabilities: array(u32),
 }
diff --git a/wire/xdg_toplevel_drag_manager_v1.txt b/wire/xdg_toplevel_drag_manager_v1.txt
index 02b02219..5b9303f4 100644
--- a/wire/xdg_toplevel_drag_manager_v1.txt
+++ b/wire/xdg_toplevel_drag_manager_v1.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_xdg_toplevel_drag = 1 {
+request get_xdg_toplevel_drag = 1 {
     id: id(xdg_toplevel_drag_v1),
     data_source: id(wl_data_source),
 }
diff --git a/wire/xdg_toplevel_drag_v1.txt b/wire/xdg_toplevel_drag_v1.txt
index ff325fed..2f57bc55 100644
--- a/wire/xdg_toplevel_drag_v1.txt
+++ b/wire/xdg_toplevel_drag_v1.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg attach = 1 {
+request attach = 1 {
     toplevel: id(xdg_toplevel),
     x_offset: i32,
     y_offset: i32,
diff --git a/wire/xdg_wm_base.txt b/wire/xdg_wm_base.txt
index 816f6ca7..f8eca6a3 100644
--- a/wire/xdg_wm_base.txt
+++ b/wire/xdg_wm_base.txt
@@ -1,22 +1,22 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg create_positioner = 1 {
+request create_positioner = 1 {
     id: id(xdg_positioner),
 }
 
-msg get_xdg_surface = 2 {
+request get_xdg_surface = 2 {
     id: id(xdg_surface),
     surface: id(wl_surface),
 }
 
-msg pong = 3 {
+request pong = 3 {
     serial: u32,
 }
 
 # events
 
-msg ping = 0 {
+event ping = 0 {
     serial: u32,
 }
diff --git a/wire/xwayland_shell_v1.txt b/wire/xwayland_shell_v1.txt
index fb53c9e9..056c8904 100644
--- a/wire/xwayland_shell_v1.txt
+++ b/wire/xwayland_shell_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg get_xwayland_surface = 1 {
+request get_xwayland_surface = 1 {
     id: id(xwayland_surface_v1),
     surface: id(wl_surface),
 }
diff --git a/wire/xwayland_surface_v1.txt b/wire/xwayland_surface_v1.txt
index d8458c92..7d61941f 100644
--- a/wire/xwayland_surface_v1.txt
+++ b/wire/xwayland_surface_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg set_serial = 0 {
+request set_serial = 0 {
     serial_lo: u32,
     serial_hi: u32,
 }
 
-msg destroy = 1 { }
+request destroy = 1 { }
diff --git a/wire/zwlr_data_control_device_v1.txt b/wire/zwlr_data_control_device_v1.txt
index 7a458bc8..abc94351 100644
--- a/wire/zwlr_data_control_device_v1.txt
+++ b/wire/zwlr_data_control_device_v1.txt
@@ -1,30 +1,30 @@
 # requests
 
-msg set_selection = 0 {
+request set_selection = 0 {
     source: id(zwlr_data_control_source_v1),
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 
 }
 
-msg set_primary_selection = 2 {
+request set_primary_selection = 2 {
     source: id(zwlr_data_control_source_v1),
 }
 
 # events
 
-msg data_offer = 0 {
+event data_offer = 0 {
     id: id(zwlr_data_control_offer_v1),
 }
 
-msg selection = 1 {
+event selection = 1 {
     id: id(zwlr_data_control_offer_v1),
 }
 
-msg finished = 2 {
+event finished = 2 {
 }
 
-msg primary_selection = 3 {
+event primary_selection = 3 {
     id: id(zwlr_data_control_offer_v1),
 }
diff --git a/wire/zwlr_data_control_manager_v1.txt b/wire/zwlr_data_control_manager_v1.txt
index 5742e10a..f91bfc62 100644
--- a/wire/zwlr_data_control_manager_v1.txt
+++ b/wire/zwlr_data_control_manager_v1.txt
@@ -1,14 +1,14 @@
 # requests
 
-msg create_data_source = 0 {
+request create_data_source = 0 {
     id: id(zwlr_data_control_source_v1),
 }
 
-msg get_data_device = 1 {
+request get_data_device = 1 {
     id: id(zwlr_data_control_device_v1),
     seat: id(wl_seat),
 }
 
-msg destroy = 2 {
+request destroy = 2 {
 
 }
diff --git a/wire/zwlr_data_control_offer_v1.txt b/wire/zwlr_data_control_offer_v1.txt
index 5a7bf7ae..3cab71f6 100644
--- a/wire/zwlr_data_control_offer_v1.txt
+++ b/wire/zwlr_data_control_offer_v1.txt
@@ -1,16 +1,16 @@
 # requests
 
-msg receive = 0 {
+request receive = 0 {
     mime_type: str,
     fd: fd,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 
 }
 
 # events
 
-msg offer = 0 {
+event offer = 0 {
     mime_type: str,
 }
diff --git a/wire/zwlr_data_control_source_v1.txt b/wire/zwlr_data_control_source_v1.txt
index b274415f..e916a1bf 100644
--- a/wire/zwlr_data_control_source_v1.txt
+++ b/wire/zwlr_data_control_source_v1.txt
@@ -1,20 +1,20 @@
 # requests
 
-msg offer = 0 {
+request offer = 0 {
     mime_type: str,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 
 }
 
 # events
 
-msg send = 0 {
+event send = 0 {
     mime_type: str,
     fd: fd,
 }
 
-msg cancelled = 1 {
+event cancelled = 1 {
 
 }
diff --git a/wire/zwlr_layer_shell_v1.txt b/wire/zwlr_layer_shell_v1.txt
index 97ea1404..aa8f1767 100644
--- a/wire/zwlr_layer_shell_v1.txt
+++ b/wire/zwlr_layer_shell_v1.txt
@@ -1,6 +1,6 @@
 # requests
 
-msg get_layer_surface = 0 {
+request get_layer_surface = 0 {
     id: id(zwlr_layer_surface_v1),
     surface: id(wl_surface),
     output: id(wl_output),
@@ -8,5 +8,5 @@ msg get_layer_surface = 0 {
     namespace: str,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 }
diff --git a/wire/zwlr_layer_surface_v1.txt b/wire/zwlr_layer_surface_v1.txt
index a043cfaf..ca5d61f9 100644
--- a/wire/zwlr_layer_surface_v1.txt
+++ b/wire/zwlr_layer_surface_v1.txt
@@ -1,49 +1,49 @@
 # requests
 
-msg set_size = 0 {
+request set_size = 0 {
     width: u32,
     height: u32,
 }
 
-msg set_anchor = 1 {
+request set_anchor = 1 {
     anchor: u32,
 }
 
-msg set_exclusive_zone = 2 {
+request set_exclusive_zone = 2 {
     zone: i32,
 }
 
-msg set_margin = 3 {
+request set_margin = 3 {
     top: i32,
     right: i32,
     bottom: i32,
     left: i32,
 }
 
-msg set_keyboard_interactivity = 4 {
+request set_keyboard_interactivity = 4 {
     keyboard_interactivity: u32,
 }
 
-msg get_popup = 5 {
+request get_popup = 5 {
     popup: id(xdg_popup),
 }
 
-msg ack_configure = 6 {
+request ack_configure = 6 {
     serial: u32,
 }
 
-msg destroy = 7 { }
+request destroy = 7 { }
 
-msg set_layer = 8 {
+request set_layer = 8 {
     layer: u32,
 }
 
 # events
 
-msg configure = 0 {
+event configure = 0 {
     serial: u32,
     width: u32,
     height: u32,
 }
 
-msg closed = 1 { }
+event closed = 1 { }
diff --git a/wire/zwlr_screencopy_frame_v1.txt b/wire/zwlr_screencopy_frame_v1.txt
index 0c60291a..c94c847c 100644
--- a/wire/zwlr_screencopy_frame_v1.txt
+++ b/wire/zwlr_screencopy_frame_v1.txt
@@ -1,51 +1,51 @@
 # requests
 
-msg copy = 0 {
+request copy = 0 {
     buffer: id(wl_buffer),
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 }
 
-msg copy_with_damage = 2 {
+request copy_with_damage = 2 {
     buffer: id(wl_buffer),
 }
 
 # events
 
-msg buffer = 0 {
+event buffer = 0 {
     format: u32,
     width: u32,
     height: u32,
     stride: u32,
 }
 
-msg flags = 1 {
+event flags = 1 {
     flags: u32,
 }
 
-msg ready = 2 {
+event ready = 2 {
     tv_sec_hi: u32,
     tv_sec_lo: u32,
     tv_nsec: u32,
 }
 
-msg failed = 3 {
+event failed = 3 {
 
 }
 
-msg damage = 4 {
+event damage = 4 {
     x: u32,
     y: u32,
     width: u32,
     height: u32,
 }
 
-msg linux_dmabuf = 5 {
+event linux_dmabuf = 5 {
     format: u32,
     width: u32,
     height: u32,
 }
 
-msg buffer_done = 6 {
+event buffer_done = 6 {
 }
diff --git a/wire/zwlr_screencopy_manager_v1.txt b/wire/zwlr_screencopy_manager_v1.txt
index 3fb2756d..1df06899 100644
--- a/wire/zwlr_screencopy_manager_v1.txt
+++ b/wire/zwlr_screencopy_manager_v1.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg capture_output = 0 {
+request capture_output = 0 {
     frame: id(zwlr_screencopy_frame_v1),
     overlay_cursor: i32,
     output: id(wl_output),
 }
 
-msg capture_output_region = 1 {
+request capture_output_region = 1 {
     frame: id(zwlr_screencopy_frame_v1),
     overlay_cursor: i32,
     output: id(wl_output),
@@ -16,5 +16,5 @@ msg capture_output_region = 1 {
     height: i32,
 }
 
-msg destroy = 2 {
+request destroy = 2 {
 }
diff --git a/wire/zwp_confined_pointer_v1.txt b/wire/zwp_confined_pointer_v1.txt
index 1ab2ad5f..e37c1bb2 100644
--- a/wire/zwp_confined_pointer_v1.txt
+++ b/wire/zwp_confined_pointer_v1.txt
@@ -1,19 +1,19 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg set_region = 1 {
+request set_region = 1 {
     region: id(wl_region),
 }
 
 # events
 
-msg confined = 0 {
+event confined = 0 {
 
 }
 
-msg unconfined = 1 {
+event unconfined = 1 {
 
 }
diff --git a/wire/zwp_idle_inhibit_manager_v1.txt b/wire/zwp_idle_inhibit_manager_v1.txt
index 68981458..0610e899 100644
--- a/wire/zwp_idle_inhibit_manager_v1.txt
+++ b/wire/zwp_idle_inhibit_manager_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg create_inhibitor = 1 {
+request create_inhibitor = 1 {
     id: id(zwp_idle_inhibitor_v1),
     surface: id(wl_surface),
 }
diff --git a/wire/zwp_idle_inhibitor_v1.txt b/wire/zwp_idle_inhibitor_v1.txt
index ed027a17..08b88698 100644
--- a/wire/zwp_idle_inhibitor_v1.txt
+++ b/wire/zwp_idle_inhibitor_v1.txt
@@ -1,3 +1,3 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
diff --git a/wire/zwp_linux_buffer_params_v1.txt b/wire/zwp_linux_buffer_params_v1.txt
index b7143f63..d11866a6 100644
--- a/wire/zwp_linux_buffer_params_v1.txt
+++ b/wire/zwp_linux_buffer_params_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg add = 1 {
+request add = 1 {
     fd: fd,
     plane_idx: u32,
     offset: u32,
@@ -11,14 +11,14 @@ msg add = 1 {
     modifier_lo: u32,
 }
 
-msg create = 2 {
+request create = 2 {
     width: i32,
     height: i32,
     format: u32,
     flags: u32,
 }
 
-msg create_immed = 3 {
+request create_immed = 3 {
     buffer_id: id(wl_buffer),
     width: i32,
     height: i32,
@@ -28,10 +28,10 @@ msg create_immed = 3 {
 
 # events
 
-msg created = 0 {
+event created = 0 {
     buffer: id(wl_buffer),
 }
 
-msg failed = 1 {
+event failed = 1 {
 
 }
diff --git a/wire/zwp_linux_dmabuf_feedback_v1.txt b/wire/zwp_linux_dmabuf_feedback_v1.txt
index 05360bb1..5e6f02f1 100644
--- a/wire/zwp_linux_dmabuf_feedback_v1.txt
+++ b/wire/zwp_linux_dmabuf_feedback_v1.txt
@@ -1,32 +1,32 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
 # events
 
-msg done = 0 { }
+event done = 0 { }
 
-msg format_table = 1 {
+event format_table = 1 {
     fd: fd,
     size: u32,
 }
 
-msg main_device = 2 {
+event main_device = 2 {
     device: pod(uapi::c::dev_t),
 }
 
-msg tranche_done = 3 {
+event tranche_done = 3 {
 
 }
 
-msg tranche_target_device = 4 {
+event tranche_target_device = 4 {
     device: pod(uapi::c::dev_t),
 }
 
-msg tranche_formats = 5 {
+event tranche_formats = 5 {
     indices: array(pod(u16)),
 }
 
-msg tranche_flags = 6 {
+event tranche_flags = 6 {
     flags: u32,
 }
diff --git a/wire/zwp_linux_dmabuf_v1.txt b/wire/zwp_linux_dmabuf_v1.txt
index a82e74c0..50c4fe3a 100644
--- a/wire/zwp_linux_dmabuf_v1.txt
+++ b/wire/zwp_linux_dmabuf_v1.txt
@@ -1,27 +1,27 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg create_params = 1 {
+request create_params = 1 {
     params_id: id(zwp_linux_buffer_params_v1),
 }
 
-msg get_default_feedback = 2 {
+request get_default_feedback = 2 {
     id: id(zwp_linux_dmabuf_feedback_v1),
 }
 
-msg get_surface_feedback = 3 {
+request get_surface_feedback = 3 {
     id: id(zwp_linux_dmabuf_feedback_v1),
     surface: id(wl_surface),
 }
 
 # events
 
-msg format = 0 {
+event format = 0 {
     format: u32,
 }
 
-msg modifier = 1 {
+event modifier = 1 {
     format: u32,
     modifier_hi: u32,
     modifier_lo: u32,
diff --git a/wire/zwp_locked_pointer_v1.txt b/wire/zwp_locked_pointer_v1.txt
index afdbcc41..edec5380 100644
--- a/wire/zwp_locked_pointer_v1.txt
+++ b/wire/zwp_locked_pointer_v1.txt
@@ -1,21 +1,21 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 }
 
-msg set_cursor_position_hint = 1 {
+request set_cursor_position_hint = 1 {
     surface_x: fixed,
     surface_y: fixed,
 }
 
-msg set_region = 2 {
+request set_region = 2 {
     region: id(wl_region),
 }
 
 # events
 
-msg locked = 0 {
+event locked = 0 {
 }
 
-msg unlocked = 1 {
+event unlocked = 1 {
 }
diff --git a/wire/zwp_pointer_constraints_v1.txt b/wire/zwp_pointer_constraints_v1.txt
index a70f3752..67fa42cc 100644
--- a/wire/zwp_pointer_constraints_v1.txt
+++ b/wire/zwp_pointer_constraints_v1.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg lock_pointer = 1 {
+request lock_pointer = 1 {
     id: id(zwp_locked_pointer_v1),
     surface: id(wl_surface),
     pointer: id(wl_pointer),
@@ -12,7 +12,7 @@ msg lock_pointer = 1 {
     lifetime: u32,
 }
 
-msg confine_pointer = 2 {
+request confine_pointer = 2 {
     id: id(zwp_confined_pointer_v1),
     surface: id(wl_surface),
     pointer: id(wl_pointer),
diff --git a/wire/zwp_primary_selection_device_manager_v1.txt b/wire/zwp_primary_selection_device_manager_v1.txt
index 1f19250f..8c1ef3db 100644
--- a/wire/zwp_primary_selection_device_manager_v1.txt
+++ b/wire/zwp_primary_selection_device_manager_v1.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg create_source = 0 {
+request create_source = 0 {
     id: id(zwp_primary_selection_source_v1),
 }
 
-msg get_device    = 1 {
+request get_device    = 1 {
     id: id(zwp_primary_selection_device_v1),
     seat: id(wl_seat),
 }
 
-msg destroy       = 2 { }
+request destroy       = 2 { }
diff --git a/wire/zwp_primary_selection_device_v1.txt b/wire/zwp_primary_selection_device_v1.txt
index 265c9f8d..164826c3 100644
--- a/wire/zwp_primary_selection_device_v1.txt
+++ b/wire/zwp_primary_selection_device_v1.txt
@@ -1,18 +1,18 @@
 # requests
 
-msg set_selection = 0 {
+request set_selection = 0 {
     source: id(zwp_primary_selection_source_v1),
     serial: u32,
 }
 
-msg destroy       = 1 { }
+request destroy       = 1 { }
 
 # events
 
-msg data_offer    = 0 {
+event data_offer    = 0 {
     offer: id(zwp_primary_selection_offer_v1),
 }
 
-msg selection     = 1 {
+event selection     = 1 {
     id: id(zwp_primary_selection_offer_v1),
 }
diff --git a/wire/zwp_primary_selection_offer_v1.txt b/wire/zwp_primary_selection_offer_v1.txt
index 3fa3c091..061699d9 100644
--- a/wire/zwp_primary_selection_offer_v1.txt
+++ b/wire/zwp_primary_selection_offer_v1.txt
@@ -1,14 +1,14 @@
 # requests
 
-msg receive = 0 {
+request receive = 0 {
     mime_type: str,
     fd: fd,
 }
 
-msg destroy = 1 { }
+request destroy = 1 { }
 
 # events
 
-msg offer   = 0 {
+event offer   = 0 {
     mime_type: str,
 }
diff --git a/wire/zwp_primary_selection_source_v1.txt b/wire/zwp_primary_selection_source_v1.txt
index 60cbb292..827bcdb9 100644
--- a/wire/zwp_primary_selection_source_v1.txt
+++ b/wire/zwp_primary_selection_source_v1.txt
@@ -1,18 +1,18 @@
 # requests
 
-msg offer = 0 {
+request offer = 0 {
     mime_type: str,
 }
 
-msg destroy = 1 { }
+request destroy = 1 { }
 
 # events
 
-msg send = 0 {
+event send = 0 {
     mime_type: str,
     fd: fd,
 }
 
-msg cancelled = 1 {
+event cancelled = 1 {
 
 }
diff --git a/wire/zwp_relative_pointer_manager_v1.txt b/wire/zwp_relative_pointer_manager_v1.txt
index ca123393..d36bec6e 100644
--- a/wire/zwp_relative_pointer_manager_v1.txt
+++ b/wire/zwp_relative_pointer_manager_v1.txt
@@ -1,10 +1,10 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg get_relative_pointer = 1 {
+request get_relative_pointer = 1 {
     id: id(zwp_relative_pointer_v1),
     pointer: id(wl_pointer),
 }
diff --git a/wire/zwp_relative_pointer_v1.txt b/wire/zwp_relative_pointer_v1.txt
index 8d884b26..e9a93e6d 100644
--- a/wire/zwp_relative_pointer_v1.txt
+++ b/wire/zwp_relative_pointer_v1.txt
@@ -1,12 +1,12 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
 # events
 
-msg relative_motion = 0 {
+event relative_motion = 0 {
     utime_hi: u32,
     utime_lo: u32,
     dx: fixed,
diff --git a/wire/zwp_tablet_tool_v2.txt b/wire/zwp_tablet_tool_v2.txt
index 6c94d13e..294b47c3 100644
--- a/wire/zwp_tablet_tool_v2.txt
+++ b/wire/zwp_tablet_tool_v2.txt
@@ -1,11 +1,11 @@
 # requests
 
-msg set_cursor = 0 {
+request set_cursor = 0 {
     serial: u32,
     surface: id(wl_surface),
     hotspot_x: i32,
     hotspot_y: i32,
 }
 
-msg destroy = 1 {
+request destroy = 1 {
 }
diff --git a/wire/zxdg_decoration_manager_v1.txt b/wire/zxdg_decoration_manager_v1.txt
index d66b286d..7650b5a9 100644
--- a/wire/zxdg_decoration_manager_v1.txt
+++ b/wire/zxdg_decoration_manager_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg get_toplevel_decoration = 1 {
+request get_toplevel_decoration = 1 {
     id: id(zxdg_toplevel_decoration_v1),
     toplevel: id(xdg_toplevel),
 }
diff --git a/wire/zxdg_output_manager_v1.txt b/wire/zxdg_output_manager_v1.txt
index 724e5da5..614c195d 100644
--- a/wire/zxdg_output_manager_v1.txt
+++ b/wire/zxdg_output_manager_v1.txt
@@ -1,8 +1,8 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
-msg get_xdg_output = 1 {
+request get_xdg_output = 1 {
     id: id(zxdg_output_v1),
     output: id(wl_output),
 }
diff --git a/wire/zxdg_output_v1.txt b/wire/zxdg_output_v1.txt
index 4a69b334..9852531e 100644
--- a/wire/zxdg_output_v1.txt
+++ b/wire/zxdg_output_v1.txt
@@ -1,25 +1,25 @@
 # requests
 
-msg destroy = 0 { }
+request destroy = 0 { }
 
 # events
 
-msg logical_position = 0 {
+event logical_position = 0 {
     x: i32,
     y: i32,
 }
 
-msg logical_size = 1 {
+event logical_size = 1 {
     width: i32,
     height: i32,
 }
 
-msg done = 2 { }
+event done = 2 { }
 
-msg name = 3 {
+event name = 3 {
     name: str,
 }
 
-msg description = 4 {
+event description = 4 {
     description: str,
 }
diff --git a/wire/zxdg_toplevel_decoration_v1.txt b/wire/zxdg_toplevel_decoration_v1.txt
index 848a570c..bec01557 100644
--- a/wire/zxdg_toplevel_decoration_v1.txt
+++ b/wire/zxdg_toplevel_decoration_v1.txt
@@ -1,18 +1,18 @@
 # requests
 
-msg destroy = 0 {
+request destroy = 0 {
 
 }
 
-msg set_mode = 1 {
+request set_mode = 1 {
     mode: u32,
 }
 
-msg unset_mode = 2 {
+request unset_mode = 2 {
 }
 
 # events
 
-msg configure = 0 {
+event configure = 0 {
     mode: u32,
 }