diff --git a/lib/foundation/fabro-model/src/catalog.rs b/lib/foundation/fabro-model/src/catalog.rs
index cac9f878f..f7c42f5ba 100644
--- a/lib/foundation/fabro-model/src/catalog.rs
+++ b/lib/foundation/fabro-model/src/catalog.rs
@@ -3118,8 +3118,11 @@ enabled = true
         for provider in [ProviderId::openai(), ProviderId::new("openrouter")] {
             for (alias, canonical_id) in [
                 ("sol", "gpt-5.6-sol"),
+                ("gpt-sol", "gpt-5.6-sol"),
                 ("terra", "gpt-5.6-terra"),
+                ("gpt-terra", "gpt-5.6-terra"),
                 ("luna", "gpt-5.6-luna"),
+                ("gpt-luna", "gpt-5.6-luna"),
             ] {
                 let model = catalog
                     .resolve_on_provider(&provider, alias)
diff --git a/lib/foundation/fabro-model/src/catalog/providers/openai.toml b/lib/foundation/fabro-model/src/catalog/providers/openai.toml
index 10b7b2193..6e44cd97e 100644
--- a/lib/foundation/fabro-model/src/catalog/providers/openai.toml
+++ b/lib/foundation/fabro-model/src/catalog/providers/openai.toml
@@ -14,7 +14,7 @@ family = "gpt-5"
 training = "2026-02-16"
 knowledge_cutoff = "February 16, 2026"
 default = true
-aliases = ["sol", "gpt56-sol", "gpt-56-sol", "gpt-5.6", "gpt56", "gpt-56"]
+aliases = ["sol", "gpt-sol", "gpt56-sol", "gpt-56-sol", "gpt-5.6", "gpt56", "gpt-56"]
 
 [providers.openai.models."gpt-5.6-sol".limits]
 context_window = 272000
@@ -37,7 +37,7 @@ display_name = "GPT-5.6 Terra"
 family = "gpt-5"
 training = "2026-02-16"
 knowledge_cutoff = "February 16, 2026"
-aliases = ["terra", "gpt56-terra", "gpt-56-terra"]
+aliases = ["terra", "gpt-terra", "gpt56-terra", "gpt-56-terra"]
 
 [providers.openai.models."gpt-5.6-terra".limits]
 context_window = 272000
@@ -60,7 +60,7 @@ display_name = "GPT-5.6 Luna"
 family = "gpt-5"
 training = "2026-02-16"
 knowledge_cutoff = "February 16, 2026"
-aliases = ["luna", "gpt56-luna", "gpt-56-luna"]
+aliases = ["luna", "gpt-luna", "gpt56-luna", "gpt-56-luna"]
 
 [providers.openai.models."gpt-5.6-luna".limits]
 context_window = 272000
diff --git a/lib/foundation/fabro-model/src/catalog/providers/openrouter.toml b/lib/foundation/fabro-model/src/catalog/providers/openrouter.toml
index b83aa7662..201608654 100644
--- a/lib/foundation/fabro-model/src/catalog/providers/openrouter.toml
+++ b/lib/foundation/fabro-model/src/catalog/providers/openrouter.toml
@@ -167,7 +167,7 @@ display_name = "GPT-5.6 Sol (via OpenRouter)"
 family = "gpt-5"
 training = "2026-02-16"
 knowledge_cutoff = "February 16, 2026"
-aliases = ["sol", "gpt56-sol", "gpt-56-sol", "gpt-5.6", "gpt56", "gpt-56"]
+aliases = ["sol", "gpt-sol", "gpt56-sol", "gpt-56-sol", "gpt-5.6", "gpt56", "gpt-56"]
 
 [providers.openrouter.models."gpt-5.6-sol".limits]
 context_window = 1050000
@@ -192,7 +192,7 @@ display_name = "GPT-5.6 Terra (via OpenRouter)"
 family = "gpt-5"
 training = "2026-02-16"
 knowledge_cutoff = "February 16, 2026"
-aliases = ["terra", "gpt56-terra", "gpt-56-terra"]
+aliases = ["terra", "gpt-terra", "gpt56-terra", "gpt-56-terra"]
 
 [providers.openrouter.models."gpt-5.6-terra".limits]
 context_window = 1050000
@@ -217,7 +217,7 @@ display_name = "GPT-5.6 Luna (via OpenRouter)"
 family = "gpt-5"
 training = "2026-02-16"
 knowledge_cutoff = "February 16, 2026"
-aliases = ["luna", "gpt56-luna", "gpt-56-luna"]
+aliases = ["luna", "gpt-luna", "gpt56-luna", "gpt-56-luna"]
 
 [providers.openrouter.models."gpt-5.6-luna".limits]
 context_window = 1050000