diff --git a/ruma-client-api/CHANGELOG.md b/ruma-client-api/CHANGELOG.md
index 258eb569..1a1d2777 100644
--- a/ruma-client-api/CHANGELOG.md
+++ b/ruma-client-api/CHANGELOG.md
@@ -38,6 +38,8 @@ Breaking changes:
 * Update type of `limit` in `r0::user_directory::search_users` from
   `Option<UInt>` to `UInt`
 * Update strum dependency to 0.19
+* Rename `r0::message::{create_message_event => send_message_event}`
+* Rename `r0::state::{create_state_event_* => send_state_event_*}`
 
 Improvements:
 
diff --git a/ruma-client-api/src/r0/message.rs b/ruma-client-api/src/r0/message.rs
index 1bcdf5ae..66d987b9 100644
--- a/ruma-client-api/src/r0/message.rs
+++ b/ruma-client-api/src/r0/message.rs
@@ -1,4 +1,4 @@
 //! Enpoints for sending and receiving messages
 
-pub mod create_message_event;
 pub mod get_message_events;
+pub mod send_message_event;
diff --git a/ruma-client-api/src/r0/message/create_message_event.rs b/ruma-client-api/src/r0/message/send_message_event.rs
similarity index 100%
rename from ruma-client-api/src/r0/message/create_message_event.rs
rename to ruma-client-api/src/r0/message/send_message_event.rs
diff --git a/ruma-client-api/src/r0/state.rs b/ruma-client-api/src/r0/state.rs
index 36c8f2b4..bc3b8cd0 100644
--- a/ruma-client-api/src/r0/state.rs
+++ b/ruma-client-api/src/r0/state.rs
@@ -1,7 +1,7 @@
 //! Endpoints for managing room state
 
-pub mod create_state_event_for_empty_key;
-pub mod create_state_event_for_key;
 pub mod get_state_events;
 pub mod get_state_events_for_empty_key;
 pub mod get_state_events_for_key;
+pub mod send_state_event_for_empty_key;
+pub mod send_state_event_for_key;
diff --git a/ruma-client-api/src/r0/state/create_state_event_for_empty_key.rs b/ruma-client-api/src/r0/state/send_state_event_for_empty_key.rs
similarity index 100%
rename from ruma-client-api/src/r0/state/create_state_event_for_empty_key.rs
rename to ruma-client-api/src/r0/state/send_state_event_for_empty_key.rs
diff --git a/ruma-client-api/src/r0/state/create_state_event_for_key.rs b/ruma-client-api/src/r0/state/send_state_event_for_key.rs
similarity index 100%
rename from ruma-client-api/src/r0/state/create_state_event_for_key.rs
rename to ruma-client-api/src/r0/state/send_state_event_for_key.rs