diff --git a/crates/dav/src/lib.rs b/crates/dav/src/lib.rs
index c957d70..db72c93 100644
--- a/crates/dav/src/lib.rs
+++ b/crates/dav/src/lib.rs
@@ -15,7 +15,7 @@ pub mod namespace;
 mod propfind;
 pub mod routes;
 
-pub struct Context<C: CalendarStore> {
+pub struct CalDavContext<C: CalendarStore> {
     pub prefix: String,
     pub store: Arc<RwLock<C>>,
 }
@@ -41,7 +41,7 @@ pub fn configure_dav<C: CalendarStore>(
         }
     });
 
-    cfg.app_data(Data::new(Context { prefix, store }))
+    cfg.app_data(Data::new(CalDavContext { prefix, store }))
         .service(
             web::resource("{path:.*}")
                 // Without the guard this service would handle all requests
diff --git a/crates/dav/src/routes/calendar.rs b/crates/dav/src/routes/calendar.rs
index 65261d0..9b1799c 100644
--- a/crates/dav/src/routes/calendar.rs
+++ b/crates/dav/src/routes/calendar.rs
@@ -3,7 +3,7 @@ use crate::propfind::{
     generate_multistatus, parse_propfind, write_invalid_props_response, write_propstat_response,
     write_resourcetype,
 };
-use crate::{Context, Error};
+use crate::{CalDavContext, Error};
 use actix_web::http::header::ContentType;
 use actix_web::http::StatusCode;
 use actix_web::web::{Data, Path};
@@ -70,7 +70,7 @@ async fn handle_report_calendar_query(
 }
 
 pub async fn route_report_calendar<C: CalendarStore>(
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
     body: String,
     path: Path<(String, String)>,
     request: HttpRequest,
@@ -172,7 +172,7 @@ pub async fn route_propfind_calendar<C: CalendarStore>(
     body: String,
     request: HttpRequest,
     auth: BasicAuth,
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
 ) -> Result<HttpResponse, Error> {
     let (_principal, cid) = path.into_inner();
     let calendar = context
diff --git a/crates/dav/src/routes/event.rs b/crates/dav/src/routes/event.rs
index 21651fe..84ca750 100644
--- a/crates/dav/src/routes/event.rs
+++ b/crates/dav/src/routes/event.rs
@@ -1,10 +1,10 @@
-use crate::{Context, Error};
+use crate::{CalDavContext, Error};
 use actix_web::web::{Data, Path};
 use actix_web::HttpResponse;
 use rustical_store::calendar::CalendarStore;
 
 pub async fn delete_event<C: CalendarStore>(
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
     path: Path<(String, String, String)>,
 ) -> Result<HttpResponse, Error> {
     let (_principal, mut cid, uid) = path.into_inner();
@@ -23,7 +23,7 @@ pub async fn delete_event<C: CalendarStore>(
 }
 
 pub async fn get_event<C: CalendarStore>(
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
     path: Path<(String, String, String)>,
 ) -> Result<HttpResponse, Error> {
     let (_principal, mut cid, uid) = path.into_inner();
@@ -44,7 +44,7 @@ pub async fn get_event<C: CalendarStore>(
 }
 
 pub async fn put_event<C: CalendarStore>(
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
     path: Path<(String, String, String)>,
     body: String,
 ) -> Result<HttpResponse, Error> {
diff --git a/crates/dav/src/routes/principal.rs b/crates/dav/src/routes/principal.rs
index feaa7dd..6ce275b 100644
--- a/crates/dav/src/routes/principal.rs
+++ b/crates/dav/src/routes/principal.rs
@@ -6,7 +6,7 @@ use crate::{
         generate_multistatus, parse_propfind, write_invalid_props_response,
         write_propstat_response, write_resourcetype,
     },
-    Context, Error,
+    CalDavContext, Error,
 };
 use actix_web::{
     http::{header::ContentType, StatusCode},
@@ -90,7 +90,7 @@ pub async fn route_propfind_principal<C: CalendarStore>(
     body: String,
     request: HttpRequest,
     auth: BasicAuth,
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
     depth: Depth,
 ) -> Result<HttpResponse, Error> {
     let props = parse_propfind(&body).map_err(|_e| Error::BadRequest)?;
diff --git a/crates/dav/src/routes/root.rs b/crates/dav/src/routes/root.rs
index cfccc20..6b791da 100644
--- a/crates/dav/src/routes/root.rs
+++ b/crates/dav/src/routes/root.rs
@@ -16,7 +16,7 @@ use crate::{
         generate_multistatus, parse_propfind, write_invalid_props_response,
         write_propstat_response, write_resourcetype,
     },
-    Context, Error,
+    CalDavContext, Error,
 };
 
 // Executes the PROPFIND request and returns a XML string to be written into a <mulstistatus> object.
@@ -68,7 +68,7 @@ pub async fn route_propfind_root<C: CalendarStore>(
     body: String,
     request: HttpRequest,
     auth: BasicAuth,
-    context: Data<Context<C>>,
+    context: Data<CalDavContext<C>>,
 ) -> Result<HttpResponse, Error> {
     let props = parse_propfind(&body).map_err(|_e| Error::BadRequest)?;