diff --git a/conf/custom_models.json b/conf/custom_models.json
index c648ce4..611e4f0 100644
--- a/conf/custom_models.json
+++ b/conf/custom_models.json
@@ -103,27 +103,9 @@
       "supports_function_calling": false,
       "description": "Meta's Llama 3 70B model"
     },
-    {
-      "model_name": "openai/gpt-4o",
-      "aliases": ["gpt4o", "4o", "gpt-4o"],
-      "context_window": 128000,
-      "supports_extended_thinking": false,
-      "supports_json_mode": true,
-      "supports_function_calling": true,
-      "description": "OpenAI's GPT-4o model"
-    },
-    {
-      "model_name": "deepseek/deepseek-coder",
-      "aliases": ["deepseek-coder", "deepseek", "coder"],
-      "context_window": 65536,
-      "supports_extended_thinking": false,
-      "supports_json_mode": true,
-      "supports_function_calling": true,
-      "description": "DeepSeek Coder model for programming tasks"
-    },
     {
       "model_name": "deepseek/deepseek-r1-0528",
-      "aliases": ["deepseek-r1", "r1", "deepseek-thinking"],
+      "aliases": ["deepseek-r1", "deepseek", "r1", "deepseek-thinking"],
       "context_window": 65536,
       "supports_extended_thinking": true,
       "supports_json_mode": true,
diff --git a/tests/test_openrouter_provider.py b/tests/test_openrouter_provider.py
index 34c9433..5fd5e00 100644
--- a/tests/test_openrouter_provider.py
+++ b/tests/test_openrouter_provider.py
@@ -52,9 +52,9 @@ class TestOpenRouterProvider:
         provider = OpenRouterProvider(api_key="test-key")
 
         # Test with a model in the registry (using alias)
-        caps = provider.get_capabilities("gpt4o")
+        caps = provider.get_capabilities("o3")
         assert caps.provider == ProviderType.OPENROUTER
-        assert caps.model_name == "openai/gpt-4o"  # Resolved name
+        assert caps.model_name == "openai/o3"  # Resolved name
         assert caps.friendly_name == "OpenRouter"
 
         # Test with a model not in registry - should get generic capabilities
@@ -71,22 +71,22 @@ class TestOpenRouterProvider:
         # Test alias resolution
         assert provider._resolve_model_name("opus") == "anthropic/claude-3-opus"
         assert provider._resolve_model_name("sonnet") == "anthropic/claude-3-sonnet"
-        assert provider._resolve_model_name("gpt4o") == "openai/gpt-4o"
-        assert provider._resolve_model_name("4o") == "openai/gpt-4o"
+        assert provider._resolve_model_name("o3") == "openai/o3"
+        assert provider._resolve_model_name("o3-mini") == "openai/o3-mini-high"
         assert provider._resolve_model_name("claude") == "anthropic/claude-3-sonnet"
         assert provider._resolve_model_name("mistral") == "mistral/mistral-large"
-        assert provider._resolve_model_name("deepseek") == "deepseek/deepseek-coder"
-        assert provider._resolve_model_name("coder") == "deepseek/deepseek-coder"
+        assert provider._resolve_model_name("deepseek") == "deepseek/deepseek-r1-0528"
+        assert provider._resolve_model_name("r1") == "deepseek/deepseek-r1-0528"
 
         # Test case-insensitive
         assert provider._resolve_model_name("OPUS") == "anthropic/claude-3-opus"
-        assert provider._resolve_model_name("GPT4O") == "openai/gpt-4o"
+        assert provider._resolve_model_name("O3") == "openai/o3"
         assert provider._resolve_model_name("Mistral") == "mistral/mistral-large"
         assert provider._resolve_model_name("CLAUDE") == "anthropic/claude-3-sonnet"
 
         # Test direct model names (should pass through unchanged)
         assert provider._resolve_model_name("anthropic/claude-3-opus") == "anthropic/claude-3-opus"
-        assert provider._resolve_model_name("openai/gpt-4o") == "openai/gpt-4o"
+        assert provider._resolve_model_name("openai/o3") == "openai/o3"
 
         # Test unknown models pass through
         assert provider._resolve_model_name("unknown-model") == "unknown-model"
@@ -120,13 +120,13 @@ class TestOpenRouterRegistry:
         models = registry.list_models()
         assert len(models) > 0
         assert "anthropic/claude-3-opus" in models
-        assert "openai/gpt-4o" in models
+        assert "openai/o3" in models
 
         # Should have loaded aliases
         aliases = registry.list_aliases()
         assert len(aliases) > 0
         assert "opus" in aliases
-        assert "gpt4o" in aliases
+        assert "o3" in aliases
         assert "claude" in aliases
 
     def test_registry_capabilities(self):
diff --git a/tests/test_openrouter_registry.py b/tests/test_openrouter_registry.py
index ffe3705..44b053c 100644
--- a/tests/test_openrouter_registry.py
+++ b/tests/test_openrouter_registry.py
@@ -77,8 +77,8 @@ class TestOpenRouterModelRegistry:
             ("opus", "anthropic/claude-3-opus"),
             ("OPUS", "anthropic/claude-3-opus"),  # Case insensitive
             ("claude", "anthropic/claude-3-sonnet"),
-            ("gpt4o", "openai/gpt-4o"),
-            ("4o", "openai/gpt-4o"),
+            ("o3", "openai/o3"),
+            ("deepseek", "deepseek/deepseek-r1-0528"),
             ("mistral", "mistral/mistral-large"),
         ]
 
@@ -96,9 +96,9 @@ class TestOpenRouterModelRegistry:
         assert config is not None
         assert config.model_name == "anthropic/claude-3-opus"
 
-        config = registry.resolve("openai/gpt-4o")
+        config = registry.resolve("openai/o3")
         assert config is not None
-        assert config.model_name == "openai/gpt-4o"
+        assert config.model_name == "openai/o3"
 
     def test_unknown_model_resolution(self):
         """Test resolution of unknown models."""