diff --git a/Cargo.toml b/Cargo.toml
index c627f372..b5e3d064 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ version = "0.2.0"
 [dependencies]
 futures-preview = "0.3.0-alpha.17"
 http = "0.1.17"
-ruma-api = "0.9.0"
+ruma-api = { git = "https://github.com/ruma/ruma-api", branch = "endpoint_is_request" }
 ruma-identifiers = "0.13.1"
 serde_json = "1.0.39"
 serde_urlencoded = "0.5.4"
@@ -34,7 +34,7 @@ version = "0.2.2"
 
 [dependencies.ruma-client-api]
 git = "https://github.com/ruma/ruma-client-api"
-branch = "update-deps"
+branch = "endpoint_is_request"
 
 [dependencies.ruma-events]
 git = "https://github.com/ruma/ruma-events"
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
index 33d091ff..b88687e2 100644
--- a/examples/hello_world.rs
+++ b/examples/hello_world.rs
@@ -19,7 +19,7 @@ async fn hello_world(homeserver_url: Url, room: String) -> Result<(), ruma_clien
 
     client.register_guest().await?;
     let response = client
-        .request::<r0::alias::get_alias::Endpoint>(r0::alias::get_alias::Request {
+        .request(r0::alias::get_alias::Request {
             room_alias: RoomAliasId::try_from(&room[..]).unwrap(),
         })
         .await?;
@@ -27,16 +27,14 @@ async fn hello_world(homeserver_url: Url, room: String) -> Result<(), ruma_clien
     let room_id = response.room_id;
 
     client
-        .request::<r0::membership::join_room_by_id::Endpoint>(
-            r0::membership::join_room_by_id::Request {
-                room_id: room_id.clone(),
-                third_party_signed: None,
-            },
-        )
+        .request(r0::membership::join_room_by_id::Request {
+            room_id: room_id.clone(),
+            third_party_signed: None,
+        })
         .await?;
 
     client
-        .request::<r0::send::send_message_event::Endpoint>(r0::send::send_message_event::Request {
+        .request(r0::send::send_message_event::Request {
             room_id: room_id,
             event_type: EventType::RoomMessage,
             txn_id: "1".to_owned(),
diff --git a/src/lib.rs b/src/lib.rs
index c999ddf9..4a4c0918 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -102,7 +102,7 @@
 )]
 
 use std::{
-    convert::{TryFrom, TryInto},
+    convert::TryFrom,
     str::FromStr,
     sync::{Arc, Mutex},
 };
@@ -228,7 +228,7 @@ where
         use ruma_client_api::r0::session::login;
 
         let response = self
-            .request::<login::Endpoint>(login::Request {
+            .request(login::Request {
                 address: None,
                 login_type: login::LoginType::Password,
                 medium: None,
@@ -255,7 +255,7 @@ where
         use ruma_client_api::r0::account::register;
 
         let response = self
-            .request::<register::Endpoint>(register::Request {
+            .request(register::Request {
                 auth: None,
                 bind_email: None,
                 device_id: None,
@@ -292,7 +292,7 @@ where
         use ruma_client_api::r0::account::register;
 
         let response = self
-            .request::<register::Endpoint>(register::Request {
+            .request(register::Request {
                 auth: None,
                 bind_email: None,
                 device_id: None,
@@ -360,7 +360,7 @@ where
                 };
 
                 let res = client
-                    .request::<sync_events::Endpoint>(sync_events::Request {
+                    .request(sync_events::Request {
                         filter,
                         since,
                         full_state: None,
@@ -381,10 +381,10 @@ where
     }
 
     /// Makes a request to a Matrix API endpoint.
-    pub fn request<E: Endpoint>(
+    pub fn request<Request: Endpoint>(
         &self,
-        request: E::Request,
-    ) -> impl Future<Output = Result<E::Response, Error>> {
+        request: Request,
+    ) -> impl Future<Output = Result<Request::Response, Error>> {
         let client = self.0.clone();
 
         async move {
@@ -398,7 +398,7 @@ where
                 url.set_path(uri.path());
                 url.set_query(uri.query());
 
-                if E::METADATA.requires_authentication {
+                if Request::METADATA.requires_authentication {
                     if let Some(ref session) = *client.session.lock().unwrap() {
                         url.query_pairs_mut()
                             .append_pair("access_token", &session.access_token);
@@ -415,7 +415,7 @@ where
             let full_response =
                 HttpResponse::from_parts(head, body.try_concat().await?.as_ref().to_owned());
 
-            Ok(E::Response::try_from(full_response)?)
+            Ok(Request::Response::try_from(full_response)?)
         }
     }
 }