diff --git a/controllers/api/mail.py b/controllers/api/mail.py
index c77f6b5..d35355d 100644
--- a/controllers/api/mail.py
+++ b/controllers/api/mail.py
@@ -226,7 +226,7 @@ class MailController:
 
         # Invoke the LLM and return the response:
         return await llm.invoke(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             user_info = user_info,
             llm_input = LLMInput(
                 messages = prompt_template + [
@@ -273,7 +273,7 @@ class MailController:
         # Simply call the core model:
         return await current_app.core_auth_token_controller.get_token_key(
             db_conn = db_conn,
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             auth_token = auth_token,
             token_notes = {
                 "email": None
@@ -293,7 +293,7 @@ class MailController:
         # Simply call the core model:
         return await current_app.core_auth_token_controller.set_token(
             db_conn = db_conn,
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             token_key = token_key,
             auth_token = auth_token,
             token_notes = {
@@ -312,7 +312,7 @@ class MailController:
 
         # Simply call the core model:
         return await current_app.core_auth_token_controller.get_token_from_key(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             token_key = token_key
         )
 
@@ -324,7 +324,7 @@ class MailController:
 
         # Simply call the core model:
         return await current_app.core_auth_token_controller.get_tokens_from_keys(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             token_keys = token_keys
         )
 
@@ -355,7 +355,7 @@ class MailController:
         # we first check if the mail already exists in our database:
         if not force_sync:
             mail_records = await current_app.core_message_controller.get_previews(
-                mongo_conn = mongo_conn,
+                mongo_data_conn = mongo_conn,
                 token_ids = [ObjectId(auth_token.authTokenId)],
                 limit = 1,
                 skip = 0,
@@ -418,7 +418,7 @@ class MailController:
         # Invoke the LLM:
         try:
             ai_snippet = await self.summarize_mail_with_ai(
-                mongo_conn = mongo_conn,
+                mongo_data_conn = mongo_conn,
                 user_info = user_info,
                 llm = llm,
                 message = mail_message,
@@ -468,7 +468,7 @@ class MailController:
             auth_token.lastRefreshTs = date_time.get_current_utc_date_time(as_string = True)
             await self.set_token(
                 db_conn = db_conn,
-                mongo_conn = mongo_conn,
+                mongo_data_conn = mongo_conn,
                 token_key = auth_token.key,
                 auth_token = auth_token,
                 session_token = session_token
@@ -494,7 +494,7 @@ class MailController:
         # Now, for every mail in the list, we fetch the mail and note the results:
         tasks = [
             self.__sync_one_gmail(
-                mongo_conn = mongo_conn,
+                mongo_data_conn = mongo_conn,
                 user_info = user_info,
                 auth_token = auth_token,
                 mail_client = mail_client,
@@ -532,7 +532,7 @@ class MailController:
         # Make the bulk insert operation:
         if mongo_operations:
             sync_count = await current_app.core_message_controller.bulk_write(
-                mongo_conn = mongo_conn,
+                mongo_data_conn = mongo_conn,
                 mongo_operations = mongo_operations
             )
 
@@ -573,7 +573,7 @@ class MailController:
 
         # We first load the authorization tokens:
         auth_token = await self.get_token_from_key(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             token_key = token_key,
         )
 
@@ -589,7 +589,7 @@ class MailController:
         if auth_token.client == "gmail":
             return await self.__sync_many_gmail(
                 db_conn = db_conn,
-                mongo_conn = mongo_conn,
+                mongo_data_conn = mongo_conn,
                 user_info = user_info,
                 auth_token = auth_token,
                 mail_client = current_app.gmail_client,
@@ -657,7 +657,7 @@ class MailController:
 
         # We first load the authorization tokens:
         auth_token = await self.get_token_from_key(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             token_key = token_key,
         )
 
@@ -673,7 +673,7 @@ class MailController:
         # if auth_token.client == "gmail":
         #     return await self.__send_one_gmail(
         #         db_conn = db_conn,
-        #         mongo_conn = mongo_conn,
+        #         mongo_data_conn = mongo_conn,
         #         user_info = user_info,
         #         auth_token = auth_token,
         #         mail_client = current_app.gmail_client,
@@ -717,7 +717,7 @@ class MailController:
 
         # Simply call the core model:
         return await current_app.core_message_controller.get_previews(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             token_ids = token_ids,
             limit = limit,
             skip = skip,
@@ -751,7 +751,7 @@ class MailController:
 
         # Simply call the core model:
         return await current_app.core_message_controller.update_tags(
-            mongo_conn = mongo_conn,
+            mongo_data_conn = mongo_conn,
             message_id = message_id,
             unset_tags = unset_tags,
             set_tags = set_tags