diff --git a/docs/get-started/configuration.md b/docs/get-started/configuration.md
index 07024ff5dc..e3415eccfa 100644
--- a/docs/get-started/configuration.md
+++ b/docs/get-started/configuration.md
@@ -370,7 +370,7 @@ their corresponding top-level category object in your `settings.json` file.
       "gemini-3-flash-preview": {
         "extends": "chat-base-3",
         "modelConfig": {
-          "model": "fiercefalcon"
+          "model": "gemini-3-flash-preview"
         }
       },
       "gemini-2.5-pro": {
@@ -504,7 +504,7 @@ their corresponding top-level category object in your `settings.json` file.
       },
       "chat-compression-3-flash": {
         "modelConfig": {
-          "model": "fiercefalcon"
+          "model": "gemini-3-flash-preview"
         }
       },
       "chat-compression-2.5-pro": {
diff --git a/packages/core/src/config/defaultModelConfigs.ts b/packages/core/src/config/defaultModelConfigs.ts
index e0c73f94fc..773223dc0c 100644
--- a/packages/core/src/config/defaultModelConfigs.ts
+++ b/packages/core/src/config/defaultModelConfigs.ts
@@ -8,10 +8,6 @@ import { ThinkingLevel } from '@google/genai';
 import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
 import { DEFAULT_THINKING_MODE } from './models.js';
 
-// TODO(joshualitt): This is safe for orions belt, but this change SHOULD NOT
-// be merged when orions belt is merged with it's upstream.
-export const FLASH_PREVIEW_MODEL_REVERT_BEFORE_MERGE = 'fiercefalcon';
-
 // The default model configs. We use `base` as the parent for all of our model
 // configs, while `chat-base`, a child of `base`, is the parent of the models
 // we use in the "chat" experience.
@@ -72,7 +68,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
     'gemini-3-flash-preview': {
       extends: 'chat-base-3',
       modelConfig: {
-        model: FLASH_PREVIEW_MODEL_REVERT_BEFORE_MERGE,
+        model: 'gemini-3-flash-preview',
       },
     },
     'gemini-2.5-pro': {
@@ -200,7 +196,7 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
     },
     'chat-compression-3-flash': {
       modelConfig: {
-        model: FLASH_PREVIEW_MODEL_REVERT_BEFORE_MERGE,
+        model: 'gemini-3-flash-preview',
       },
     },
     'chat-compression-2.5-pro': {
diff --git a/packages/core/src/services/test-data/resolved-aliases-retry.golden.json b/packages/core/src/services/test-data/resolved-aliases-retry.golden.json
deleted file mode 100644
index 451e50c5cd..0000000000
--- a/packages/core/src/services/test-data/resolved-aliases-retry.golden.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-  "base": {
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "chat-base": {
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true
-      },
-      "topK": 64
-    }
-  },
-  "chat-base-2.5": {
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true,
-        "thinkingBudget": 8192
-      },
-      "topK": 64
-    }
-  },
-  "chat-base-3": {
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true,
-        "thinkingLevel": "HIGH"
-      },
-      "topK": 64
-    }
-  },
-  "gemini-3-pro-preview": {
-    "model": "gemini-3-pro-preview",
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true,
-        "thinkingLevel": "HIGH"
-      },
-      "topK": 64
-    }
-  },
-  "gemini-2.5-pro": {
-    "model": "gemini-2.5-pro",
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true,
-        "thinkingBudget": 8192
-      },
-      "topK": 64
-    }
-  },
-  "gemini-2.5-flash": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true,
-        "thinkingBudget": 8192
-      },
-      "topK": 64
-    }
-  },
-  "gemini-2.5-flash-lite": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {
-      "temperature": 1,
-      "topP": 0.95,
-      "thinkingConfig": {
-        "includeThoughts": true,
-        "thinkingBudget": 8192
-      },
-      "topK": 64
-    }
-  },
-  "gemini-2.5-flash-base": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "classifier": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1,
-      "maxOutputTokens": 1024,
-      "thinkingConfig": {
-        "thinkingBudget": 512
-      }
-    }
-  },
-  "prompt-completion": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {
-      "temperature": 0.3,
-      "topP": 1,
-      "maxOutputTokens": 16000,
-      "thinkingConfig": {
-        "thinkingBudget": 0
-      }
-    }
-  },
-  "edit-corrector": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1,
-      "thinkingConfig": {
-        "thinkingBudget": 0
-      }
-    }
-  },
-  "summarizer-default": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1,
-      "maxOutputTokens": 2000
-    }
-  },
-  "summarizer-shell": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1,
-      "maxOutputTokens": 2000
-    }
-  },
-  "web-search": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1,
-      "tools": [
-        {
-          "googleSearch": {}
-        }
-      ]
-    }
-  },
-  "web-fetch": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1,
-      "tools": [
-        {
-          "urlContext": {}
-        }
-      ]
-    }
-  },
-  "web-fetch-fallback": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "loop-detection": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "loop-detection-double-check": {
-    "model": "gemini-2.5-pro",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "llm-edit-fixer": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "next-speaker-checker": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {
-      "temperature": 0,
-      "topP": 1
-    }
-  },
-  "chat-compression-3-pro": {
-    "model": "gemini-3-pro-preview",
-    "generateContentConfig": {}
-  },
-  "chat-compression-2.5-pro": {
-    "model": "gemini-2.5-pro",
-    "generateContentConfig": {}
-  },
-  "chat-compression-2.5-flash": {
-    "model": "gemini-2.5-flash",
-    "generateContentConfig": {}
-  },
-  "chat-compression-2.5-flash-lite": {
-    "model": "gemini-2.5-flash-lite",
-    "generateContentConfig": {}
-  },
-  "chat-compression-default": {
-    "model": "gemini-2.5-pro",
-    "generateContentConfig": {}
-  }
-}
diff --git a/packages/core/src/services/test-data/resolved-aliases.golden.json b/packages/core/src/services/test-data/resolved-aliases.golden.json
index a2fc4fd444..3b38b909d8 100644
--- a/packages/core/src/services/test-data/resolved-aliases.golden.json
+++ b/packages/core/src/services/test-data/resolved-aliases.golden.json
@@ -50,7 +50,7 @@
     }
   },
   "gemini-3-flash-preview": {
-    "model": "fiercefalcon",
+    "model": "gemini-3-flash-preview",
     "generateContentConfig": {
       "temperature": 1,
       "topP": 0.95,
@@ -216,7 +216,7 @@
     "generateContentConfig": {}
   },
   "chat-compression-3-flash": {
-    "model": "fiercefalcon",
+    "model": "gemini-3-flash-preview",
     "generateContentConfig": {}
   },
   "chat-compression-2.5-pro": {