diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs
index f1588313..4055d0de 100644
--- a/matrix_sdk/src/client.rs
+++ b/matrix_sdk/src/client.rs
@@ -501,7 +501,7 @@ impl RequestConfig {
     /// All outgoing http requests will have a GET query key-value appended with
     /// `user_id` being the key and the `user_id` from the `Session` being
     /// the value. Will error if there's no `Session`. This is called
-    /// [identity assertion] in the Matrix Appservice Spec
+    /// [identity assertion] in the Matrix Application Service Spec
     ///
     /// [identity assertion]: https://spec.matrix.org/unstable/application-service-api/#identity-assertion
     #[cfg(feature = "appservice")]
diff --git a/matrix_sdk_appservice/examples/appservice_autojoin.rs b/matrix_sdk_appservice/examples/appservice_autojoin.rs
index 0fbd99f7..fddba03c 100644
--- a/matrix_sdk_appservice/examples/appservice_autojoin.rs
+++ b/matrix_sdk_appservice/examples/appservice_autojoin.rs
@@ -11,16 +11,16 @@ use matrix_sdk_appservice::{
         room::Room,
         EventHandler,
     },
-    Appservice, AppserviceRegistration,
+    AppService, AppServiceRegistration,
 };
 use tracing::{error, trace};
 
-struct AppserviceEventHandler {
-    appservice: Appservice,
+struct AppServiceEventHandler {
+    appservice: AppService,
 }
 
-impl AppserviceEventHandler {
-    pub fn new(appservice: Appservice) -> Self {
+impl AppServiceEventHandler {
+    pub fn new(appservice: AppService) -> Self {
         Self { appservice }
     }
 
@@ -47,7 +47,7 @@ impl AppserviceEventHandler {
 }
 
 #[async_trait]
-impl EventHandler for AppserviceEventHandler {
+impl EventHandler for AppServiceEventHandler {
     async fn on_room_member(&self, room: Room, event: &SyncStateEvent<MemberEventContent>) {
         match self.handle_room_member(room, event).await {
             Ok(_) => (),
@@ -63,10 +63,10 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let homeserver_url = "http://localhost:8008";
     let server_name = "localhost";
-    let registration = AppserviceRegistration::try_from_yaml_file("./tests/registration.yaml")?;
+    let registration = AppServiceRegistration::try_from_yaml_file("./tests/registration.yaml")?;
 
-    let mut appservice = Appservice::new(homeserver_url, server_name, registration).await?;
-    appservice.set_event_handler(Box::new(AppserviceEventHandler::new(appservice.clone()))).await?;
+    let mut appservice = AppService::new(homeserver_url, server_name, registration).await?;
+    appservice.set_event_handler(Box::new(AppServiceEventHandler::new(appservice.clone()))).await?;
 
     let (host, port) = appservice.registration().get_host_and_port()?;
     appservice.run(host, port).await?;
diff --git a/matrix_sdk_appservice/src/lib.rs b/matrix_sdk_appservice/src/lib.rs
index d94eff1e..6a7f6347 100644
--- a/matrix_sdk_appservice/src/lib.rs
+++ b/matrix_sdk_appservice/src/lib.rs
@@ -41,11 +41,11 @@
 //! # #[async_trait]
 //! # impl EventHandler for MyEventHandler {}
 //! #
-//! use matrix_sdk_appservice::{Appservice, AppserviceRegistration};
+//! use matrix_sdk_appservice::{AppService, AppServiceRegistration};
 //!
 //! let homeserver_url = "http://127.0.0.1:8008";
 //! let server_name = "localhost";
-//! let registration = AppserviceRegistration::try_from_yaml_str(
+//! let registration = AppServiceRegistration::try_from_yaml_str(
 //!     r"
 //!         id: appservice
 //!         url: http://127.0.0.1:9009
@@ -58,7 +58,7 @@
 //!             regex: '@_appservice_.*'
 //!     ")?;
 //!
-//! let mut appservice = Appservice::new(homeserver_url, server_name, registration).await?;
+//! let mut appservice = AppService::new(homeserver_url, server_name, registration).await?;
 //! appservice.set_event_handler(Box::new(MyEventHandler)).await?;
 //!
 //! let (host, port) = appservice.registration().get_host_and_port()?;
@@ -112,15 +112,15 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub type Host = String;
 pub type Port = u16;
 
-/// Appservice Registration
+/// AppService Registration
 ///
 /// Wrapper around [`Registration`]
 #[derive(Debug, Clone)]
-pub struct AppserviceRegistration {
+pub struct AppServiceRegistration {
     inner: Registration,
 }
 
-impl AppserviceRegistration {
+impl AppServiceRegistration {
     /// Try to load registration from yaml string
     ///
     /// See the fields of [`Registration`] for the required format
@@ -158,13 +158,13 @@ impl AppserviceRegistration {
     }
 }
 
-impl From<Registration> for AppserviceRegistration {
+impl From<Registration> for AppServiceRegistration {
     fn from(value: Registration) -> Self {
         Self { inner: value }
     }
 }
 
-impl Deref for AppserviceRegistration {
+impl Deref for AppServiceRegistration {
     type Target = Registration;
 
     fn deref(&self) -> &Self::Target {
@@ -175,7 +175,7 @@ impl Deref for AppserviceRegistration {
 type Localpart = String;
 
 /// The `localpart` of the user associated with the application service via
-/// `sender_localpart` in [`AppserviceRegistration`].
+/// `sender_localpart` in [`AppServiceRegistration`].
 ///
 /// Dummy type for shared documentation
 #[allow(dead_code)]
@@ -183,23 +183,23 @@ pub type MainUser = ();
 
 /// The application service may specify the virtual user to act as through use
 /// of a user_id query string parameter on the request. The user specified in
-/// the query string must be covered by one of the [`AppserviceRegistration`]'s
+/// the query string must be covered by one of the [`AppServiceRegistration`]'s
 /// `users` namespaces.
 ///
 /// Dummy type for shared documentation
 pub type VirtualUser = ();
 
-/// Appservice
+/// AppService
 #[derive(Debug, Clone)]
-pub struct Appservice {
+pub struct AppService {
     homeserver_url: Url,
     server_name: ServerNameBox,
-    registration: Arc<AppserviceRegistration>,
+    registration: Arc<AppServiceRegistration>,
     clients: Arc<DashMap<Localpart, Client>>,
 }
 
-impl Appservice {
-    /// Create new Appservice
+impl AppService {
+    /// Create new AppService
     ///
     /// Also creates and caches a [`Client`] for the [`MainUser`].
     /// The default [`ClientConfig`] is used, if you want to customize it
@@ -210,14 +210,14 @@ impl Appservice {
     /// * `homeserver_url` - The homeserver that the client should connect to.
     /// * `server_name` - The server name to use when constructing user ids from
     ///   the localpart.
-    /// * `registration` - The [Appservice Registration] to use when interacting
+    /// * `registration` - The [AppService Registration] to use when interacting
     ///   with the homeserver.
     ///
-    /// [Appservice Registration]: https://matrix.org/docs/spec/application_service/r0.1.2#registration
+    /// [AppService Registration]: https://matrix.org/docs/spec/application_service/r0.1.2#registration
     pub async fn new(
         homeserver_url: impl TryInto<Url, Error = url::ParseError>,
         server_name: impl TryInto<ServerNameBox, Error = identifiers::Error>,
-        registration: AppserviceRegistration,
+        registration: AppServiceRegistration,
     ) -> Result<Self> {
         let appservice = Self::new_with_config(
             homeserver_url,
@@ -235,7 +235,7 @@ impl Appservice {
     pub async fn new_with_config(
         homeserver_url: impl TryInto<Url, Error = url::ParseError>,
         server_name: impl TryInto<ServerNameBox, Error = identifiers::Error>,
-        registration: AppserviceRegistration,
+        registration: AppServiceRegistration,
         client_config: ClientConfig,
     ) -> Result<Self> {
         let homeserver_url = homeserver_url.try_into()?;
@@ -244,7 +244,7 @@ impl Appservice {
         let clients = Arc::new(DashMap::new());
         let sender_localpart = registration.sender_localpart.clone();
 
-        let appservice = Appservice { homeserver_url, server_name, registration, clients };
+        let appservice = AppService { homeserver_url, server_name, registration, clients };
 
         // we create and cache the [`MainUser`] by default
         appservice.create_and_cache_client(&sender_localpart, client_config).await?;
@@ -354,12 +354,12 @@ impl Appservice {
     /// Convenience wrapper around [`Client::set_event_handler()`] that attaches
     /// the event handler to the [`MainUser`]'s [`Client`]
     ///
-    /// Note that the event handler in the [`Appservice`] context only triggers
+    /// Note that the event handler in the [`AppService`] context only triggers
     /// [`join` room `timeline` events], so no state events or events from the
     /// `invite`, `knock` or `leave` scope. The rationale behind that is
-    /// that incoming Appservice transactions from the homeserver are not
+    /// that incoming AppService transactions from the homeserver are not
     /// necessarily bound to a specific user but can cover a multitude of
-    /// namespaces, and as such the Appservice basically only "observes
+    /// namespaces, and as such the AppService basically only "observes
     /// joined rooms". Also currently homeservers only push PDUs to appservices,
     /// no EDUs. There's the open [MSC2409] regarding supporting EDUs in the
     /// future, though it seems to be planned to put EDUs into a different
@@ -410,10 +410,10 @@ impl Appservice {
         Ok(())
     }
 
-    /// Get the Appservice [registration]
+    /// Get the AppService [registration]
     ///
     /// [registration]: https://matrix.org/docs/spec/application_service/r0.1.2#registration
-    pub fn registration(&self) -> &AppserviceRegistration {
+    pub fn registration(&self) -> &AppServiceRegistration {
         &self.registration
     }
 
@@ -424,11 +424,11 @@ impl Appservice {
         self.registration.hs_token == hs_token.as_ref()
     }
 
-    /// Check if given `user_id` is in any of the [`AppserviceRegistration`]'s
+    /// Check if given `user_id` is in any of the [`AppServiceRegistration`]'s
     /// `users` namespaces
     pub fn user_id_is_in_namespace(&self, user_id: impl AsRef<str>) -> Result<bool> {
         for user in &self.registration.namespaces.users {
-            // TODO: precompile on Appservice construction
+            // TODO: precompile on AppService construction
             let re = Regex::new(&user.regex)?;
             if re.is_match(user_id.as_ref()) {
                 return Ok(true);
@@ -477,7 +477,7 @@ impl Appservice {
     pub async fn run(&self, host: impl Into<String>, port: impl Into<u16>) -> Result<()> {
         let host = host.into();
         let port = port.into();
-        info!("Starting Appservice on {}:{}", &host, &port);
+        info!("Starting AppService on {}:{}", &host, &port);
 
         #[cfg(feature = "actix")]
         {
diff --git a/matrix_sdk_appservice/src/webserver/actix.rs b/matrix_sdk_appservice/src/webserver/actix.rs
index b983f92e..5c22643d 100644
--- a/matrix_sdk_appservice/src/webserver/actix.rs
+++ b/matrix_sdk_appservice/src/webserver/actix.rs
@@ -26,10 +26,10 @@ use futures::Future;
 use futures_util::TryStreamExt;
 use ruma::api::appservice as api;
 
-use crate::{error::Error, Appservice};
+use crate::{error::Error, AppService};
 
 pub async fn run_server(
-    appservice: Appservice,
+    appservice: AppService,
     host: impl Into<String>,
     port: impl Into<u16>,
 ) -> Result<(), Error> {
@@ -55,7 +55,7 @@ pub fn configure(config: &mut actix_web::web::ServiceConfig) {
 #[put("/transactions/{txn_id}")]
 async fn push_transactions(
     request: IncomingRequest<api::event::push_events::v1::IncomingRequest>,
-    appservice: Data<Appservice>,
+    appservice: Data<AppService>,
 ) -> Result<HttpResponse, Error> {
     if !appservice.compare_hs_token(request.access_token) {
         return Ok(HttpResponse::Unauthorized().finish());
@@ -70,7 +70,7 @@ async fn push_transactions(
 #[get("/users/{user_id}")]
 async fn query_user_id(
     request: IncomingRequest<api::query::query_user_id::v1::IncomingRequest>,
-    appservice: Data<Appservice>,
+    appservice: Data<AppService>,
 ) -> Result<HttpResponse, Error> {
     if !appservice.compare_hs_token(request.access_token) {
         return Ok(HttpResponse::Unauthorized().finish());
@@ -83,7 +83,7 @@ async fn query_user_id(
 #[get("/rooms/{room_alias}")]
 async fn query_room_alias(
     request: IncomingRequest<api::query::query_room_alias::v1::IncomingRequest>,
-    appservice: Data<Appservice>,
+    appservice: Data<AppService>,
 ) -> Result<HttpResponse, Error> {
     if !appservice.compare_hs_token(request.access_token) {
         return Ok(HttpResponse::Unauthorized().finish());
diff --git a/matrix_sdk_appservice/src/webserver/warp.rs b/matrix_sdk_appservice/src/webserver/warp.rs
index 9a4f3504..7c584436 100644
--- a/matrix_sdk_appservice/src/webserver/warp.rs
+++ b/matrix_sdk_appservice/src/webserver/warp.rs
@@ -19,10 +19,10 @@ use matrix_sdk::Bytes;
 use serde::Serialize;
 use warp::{filters::BoxedFilter, path::FullPath, Filter, Rejection, Reply};
 
-use crate::{Appservice, Error, Result};
+use crate::{AppService, Error, Result};
 
 pub async fn run_server(
-    appservice: Appservice,
+    appservice: AppService,
     host: impl Into<String>,
     port: impl Into<u16>,
 ) -> Result<()> {
@@ -37,7 +37,7 @@ pub async fn run_server(
     }
 }
 
-pub fn warp_filter(appservice: Appservice) -> BoxedFilter<(impl Reply,)> {
+pub fn warp_filter(appservice: AppService) -> BoxedFilter<(impl Reply,)> {
     // TODO: try to use a struct instead of needlessly cloning appservice multiple
     // times on every request
     warp::any()
@@ -51,7 +51,7 @@ pub fn warp_filter(appservice: Appservice) -> BoxedFilter<(impl Reply,)> {
 mod filters {
     use super::*;
 
-    pub fn users(appservice: Appservice) -> BoxedFilter<(impl Reply,)> {
+    pub fn users(appservice: AppService) -> BoxedFilter<(impl Reply,)> {
         warp::get()
             .and(
                 warp::path!("_matrix" / "app" / "v1" / "users" / String)
@@ -65,7 +65,7 @@ mod filters {
             .boxed()
     }
 
-    pub fn rooms(appservice: Appservice) -> BoxedFilter<(impl Reply,)> {
+    pub fn rooms(appservice: AppService) -> BoxedFilter<(impl Reply,)> {
         warp::get()
             .and(
                 warp::path!("_matrix" / "app" / "v1" / "rooms" / String)
@@ -79,7 +79,7 @@ mod filters {
             .boxed()
     }
 
-    pub fn transactions(appservice: Appservice) -> BoxedFilter<(impl Reply,)> {
+    pub fn transactions(appservice: AppService) -> BoxedFilter<(impl Reply,)> {
         warp::put()
             .and(
                 warp::path!("_matrix" / "app" / "v1" / "transactions" / String)
@@ -93,7 +93,7 @@ mod filters {
             .boxed()
     }
 
-    fn common(appservice: Appservice) -> BoxedFilter<(Appservice, http::Request<Bytes>)> {
+    fn common(appservice: AppService) -> BoxedFilter<(AppService, http::Request<Bytes>)> {
         warp::any()
             .and(filters::valid_access_token(appservice.registration().hs_token.clone()))
             .map(move || appservice.clone())
@@ -156,7 +156,7 @@ mod handlers {
 
     pub async fn user(
         _user_id: String,
-        _appservice: Appservice,
+        _appservice: AppService,
         _request: http::Request<Bytes>,
     ) -> StdResult<impl warp::Reply, Rejection> {
         Ok(warp::reply::json(&String::from("{}")))
@@ -164,7 +164,7 @@ mod handlers {
 
     pub async fn room(
         _room_id: String,
-        _appservice: Appservice,
+        _appservice: AppService,
         _request: http::Request<Bytes>,
     ) -> StdResult<impl warp::Reply, Rejection> {
         Ok(warp::reply::json(&String::from("{}")))
@@ -172,7 +172,7 @@ mod handlers {
 
     pub async fn transaction(
         _txn_id: String,
-        appservice: Appservice,
+        appservice: AppService,
         request: http::Request<Bytes>,
     ) -> StdResult<impl warp::Reply, Rejection> {
         let incoming_transaction: matrix_sdk::api_appservice::event::push_events::v1::IncomingRequest =
diff --git a/matrix_sdk_appservice/tests/tests.rs b/matrix_sdk_appservice/tests/tests.rs
index f407b1c0..c68e5ad0 100644
--- a/matrix_sdk_appservice/tests/tests.rs
+++ b/matrix_sdk_appservice/tests/tests.rs
@@ -19,7 +19,7 @@ fn registration_string() -> String {
     include_str!("../tests/registration.yaml").to_owned()
 }
 
-async fn appservice(registration: Option<Registration>) -> Result<Appservice> {
+async fn appservice(registration: Option<Registration>) -> Result<AppService> {
     // env::set_var(
     //     "RUST_LOG",
     //     "mockito=debug,matrix_sdk=debug,ruma=debug,actix_web=debug,warp=debug",
@@ -28,7 +28,7 @@ async fn appservice(registration: Option<Registration>) -> Result<Appservice> {
 
     let registration = match registration {
         Some(registration) => registration.into(),
-        None => AppserviceRegistration::try_from_yaml_str(registration_string()).unwrap(),
+        None => AppServiceRegistration::try_from_yaml_str(registration_string()).unwrap(),
     };
 
     let homeserver_url = mockito::server_url();
@@ -37,7 +37,7 @@ async fn appservice(registration: Option<Registration>) -> Result<Appservice> {
     let client_config =
         ClientConfig::default().request_config(RequestConfig::default().disable_retry());
 
-    Ok(Appservice::new_with_config(
+    Ok(AppService::new_with_config(
         homeserver_url.as_ref(),
         server_name,
         registration,
@@ -355,7 +355,7 @@ mod registration {
     #[test]
     fn test_registration() -> Result<()> {
         let registration: Registration = serde_yaml::from_str(&registration_string())?;
-        let registration: AppserviceRegistration = registration.into();
+        let registration: AppServiceRegistration = registration.into();
 
         assert_eq!(registration.id, "appservice");
 
@@ -364,7 +364,7 @@ mod registration {
 
     #[test]
     fn test_registration_from_yaml_file() -> Result<()> {
-        let registration = AppserviceRegistration::try_from_yaml_file("./tests/registration.yaml")?;
+        let registration = AppServiceRegistration::try_from_yaml_file("./tests/registration.yaml")?;
 
         assert_eq!(registration.id, "appservice");
 
@@ -373,7 +373,7 @@ mod registration {
 
     #[test]
     fn test_registration_from_yaml_str() -> Result<()> {
-        let registration = AppserviceRegistration::try_from_yaml_str(registration_string())?;
+        let registration = AppServiceRegistration::try_from_yaml_str(registration_string())?;
 
         assert_eq!(registration.id, "appservice");