diff --git a/Cargo.toml b/Cargo.toml
index 470c74d5..d3df0fad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,10 +21,10 @@ futures-util = "0.3.4"
 http = "0.2.1"
 hyper = "0.13.5"
 hyper-tls = { version = "0.4.1", optional = true }
-ruma-api = "0.16.0-rc.1"
-ruma-client-api = "0.8.0-rc.1"
-ruma-events = "0.19.0-rc.1"
-ruma-identifiers = "0.15.1"
+ruma-api = "0.16.0-rc.2"
+ruma-client-api = "0.8.0-rc.3"
+ruma-events = "0.19.0"
+ruma-identifiers = "0.16.0"
 serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.51"
 serde_urlencoded = "0.6.1"
diff --git a/src/lib.rs b/src/lib.rs
index efe27347..7f8f6399 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -251,7 +251,7 @@ where
     /// Register as a guest. In contrast to `api::r0::account::register::call()`,
     /// this method stores the session data returned by the endpoint in this
     /// client, instead of returning it.
-    pub async fn register_guest(&self) -> Result<Session, Error<api::Error>> {
+    pub async fn register_guest(&self) -> Result<Session, Error<api::r0::uiaa::UiaaResponse>> {
         use api::r0::account::register;
 
         let response = self
@@ -293,7 +293,7 @@ where
         &self,
         username: Option<String>,
         password: String,
-    ) -> Result<Session, Error<api::Error>> {
+    ) -> Result<Session, Error<api::r0::uiaa::UiaaResponse>> {
         use api::r0::account::register;
 
         let response = self
@@ -365,7 +365,9 @@ where
     pub fn request<Request: Endpoint>(
         &self,
         request: Request,
-    ) -> impl Future<Output = Result<<Request::Response as Outgoing>::Incoming, Error<Request::ResponseError>>>
+    ) -> impl Future<
+        Output = Result<<Request::Response as Outgoing>::Incoming, Error<Request::ResponseError>>,
+    >
     // We need to duplicate Endpoint's where clauses because the compiler is not smart enough yet.
     // See https://github.com/rust-lang/rust/issues/54149
     where
@@ -381,7 +383,9 @@ where
         &self,
         request: Request,
         params: Option<BTreeMap<String, String>>,
-    ) -> impl Future<Output = Result<<Request::Response as Outgoing>::Incoming, Error<Request::ResponseError>>>
+    ) -> impl Future<
+        Output = Result<<Request::Response as Outgoing>::Incoming, Error<Request::ResponseError>>,
+    >
     // We need to duplicate Endpoint's where clauses because the compiler is not smart enough yet.
     // See https://github.com/rust-lang/rust/issues/54149
     where