diff --git a/src/config/modelProviders/anthropic.ts b/src/config/modelProviders/anthropic.ts
index c7aa2b1c349d..ec2721767a22 100644
--- a/src/config/modelProviders/anthropic.ts
+++ b/src/config/modelProviders/anthropic.ts
@@ -20,10 +20,27 @@ const Anthropic: ModelProviderCard = {
       tokens: 200_000,
       vision: true,
     },
+    {
+      description:
+        'Fastest and most compact model for near-instant responsiveness. Quick and accurate targeted performance',
+      displayName: 'Claude 3 Haiku',
+      enabled: true,
+      functionCall: true,
+      id: 'claude-3-haiku-20240307',
+      maxOutput: 4096,
+      pricing: {
+        input: 0.25,
+        output: 1.25,
+      },
+      releasedAt: '2024-03-07',
+      tokens: 200_000,
+      vision: true,
+    },
     {
       description:
         'Ideal balance of intelligence and speed for enterprise workloads. Maximum utility at a lower price, dependable, balanced for scaled deployments',
       displayName: 'Claude 3 Sonnet',
+      enabled: true,
       functionCall: true,
       id: 'claude-3-sonnet-20240229',
       maxOutput: 4096,
@@ -51,22 +68,6 @@ const Anthropic: ModelProviderCard = {
       tokens: 200_000,
       vision: true,
     },
-    {
-      description:
-        'Fastest and most compact model for near-instant responsiveness. Quick and accurate targeted performance',
-      displayName: 'Claude 3 Haiku',
-      enabled: true,
-      functionCall: true,
-      id: 'claude-3-haiku-20240307',
-      maxOutput: 4096,
-      pricing: {
-        input: 0.25,
-        output: 1.25,
-      },
-      releasedAt: '2024-03-07',
-      tokens: 200_000,
-      vision: true,
-    },
     {
       displayName: 'Claude 2.1',
       id: 'claude-2.1',
diff --git a/src/config/modelProviders/groq.ts b/src/config/modelProviders/groq.ts
index 0aa8bf6e4a73..eee858f13663 100644
--- a/src/config/modelProviders/groq.ts
+++ b/src/config/modelProviders/groq.ts
@@ -38,7 +38,7 @@ const Groq: ModelProviderCard = {
     },
 */
     {
-      displayName: 'Llama 3 Groq 8B Tool Use Preview 8K',
+      displayName: 'Llama 3 Groq 8B Tool Use (Preview)',
       enabled: true,
       functionCall: true,
       id: 'llama3-groq-8b-8192-tool-use-preview',
@@ -49,7 +49,7 @@ const Groq: ModelProviderCard = {
       tokens: 8192,
     },
     {
-      displayName: 'Llama 3 Groq 70B Tool Use Preview 8K',
+      displayName: 'Llama 3 Groq 70B Tool Use (Preview)',
       enabled: true,
       functionCall: true,
       id: 'llama3-groq-70b-8192-tool-use-preview',
@@ -61,7 +61,6 @@ const Groq: ModelProviderCard = {
     },
     {
       displayName: 'Meta Llama 3 8B',
-      enabled: true,
       functionCall: true,
       id: 'llama3-8b-8192',
       pricing: {
@@ -72,7 +71,6 @@ const Groq: ModelProviderCard = {
     },
     {
       displayName: 'Meta Llama 3 70B',
-      enabled: true,
       functionCall: true,
       id: 'llama3-70b-8192',
       pricing: {
@@ -82,7 +80,7 @@ const Groq: ModelProviderCard = {
       tokens: 8192,
     },
     {
-      displayName: 'Gemma 2 9B 8k',
+      displayName: 'Gemma 2 9B',
       enabled: true,
       functionCall: true,
       id: 'gemma2-9b-it',
@@ -93,7 +91,7 @@ const Groq: ModelProviderCard = {
       tokens: 8192,
     },
     {
-      displayName: 'Gemma 7B 8k Instruct',
+      displayName: 'Gemma 7B',
       functionCall: true,
       id: 'gemma-7b-it',
       pricing: {
@@ -103,8 +101,7 @@ const Groq: ModelProviderCard = {
       tokens: 8192,
     },
     {
-      displayName: 'Mixtral 8x7B Instruct 32k',
-      enabled: true,
+      displayName: 'Mixtral 8x7B',
       functionCall: true,
       id: 'mixtral-8x7b-32768',
       pricing: {