diff --git a/aider/models.py b/aider/models.py
index 88bb4bb7c..06e151fd8 100644
--- a/aider/models.py
+++ b/aider/models.py
@@ -262,7 +262,7 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="claude-3-haiku-20240307",
         junior_model_name="claude-3-5-sonnet-20240620",
-        junior_edit_format="diff",
+        junior_edit_format="junior-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
         accepts_images=True,
@@ -278,7 +278,7 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="claude-3-haiku-20240307",
         junior_model_name="anthropic/claude-3-5-sonnet-20240620",
-        junior_edit_format="diff",
+        junior_edit_format="junior-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
         max_tokens=8192,
@@ -313,7 +313,7 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="openrouter/anthropic/claude-3-haiku-20240307",
         junior_model_name="openrouter/anthropic/claude-3.5-sonnet",
-        junior_edit_format="diff",
+        junior_edit_format="junior-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
         accepts_images=True,
@@ -328,7 +328,7 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="vertex_ai/claude-3-haiku@20240307",
         junior_model_name="vertex_ai/claude-3-5-sonnet@20240620",
-        junior_edit_format="diff",
+        junior_edit_format="junior-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
         accepts_images=True,
@@ -500,7 +500,7 @@ MODEL_SETTINGS = [
         "senior",
         weak_model_name="gpt-4o-mini",
         junior_model_name="gpt-4o",
-        junior_edit_format="diff",
+        junior_edit_format="junior-diff",
         use_repo_map=True,
         reminder="user",
         use_system_prompt=False,