diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs
index 9a1b3f86..11f54bcc 100644
--- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/TextSummarizer/AssistantTextSummarizer.razor.cs	
@@ -81,7 +81,7 @@ public partial class AssistantTextSummarizer : AssistantBaseCore
         this.CreateChatThread();
         var time = this.AddUserRequest(
             $"""
-                {this.selectedTargetLanguage.Prompt(this.customTargetLanguage)}
+                {this.selectedTargetLanguage.PromptSummarizing(this.customTargetLanguage)}
                 {this.selectedComplexity.Prompt(this.expertInField)}
                 
                 Please summarize the following text:
diff --git a/app/MindWork AI Studio/Components/Pages/TextSummarizer/CommonLanguagePrompts.cs b/app/MindWork AI Studio/Components/Pages/TextSummarizer/CommonLanguagePrompts.cs
deleted file mode 100644
index 503ba243..00000000
--- a/app/MindWork AI Studio/Components/Pages/TextSummarizer/CommonLanguagePrompts.cs	
+++ /dev/null
@@ -1,14 +0,0 @@
-using AIStudio.Tools;
-
-namespace AIStudio.Components.Pages.TextSummarizer;
-
-public static class CommonLanguagePrompts
-{
-    public static string Prompt(this CommonLanguages language, string customLanguage) => language switch
-    {
-        CommonLanguages.AS_IS => "Do not change the language of the text.",
-        CommonLanguages.OTHER => $"Output your summary in {customLanguage}.",
-
-        _ => $"Output your summary in {language.Name()} ({language}).",
-    };
-}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor b/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor
index 70e5b6cc..0d30af06 100644
--- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor	
+++ b/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor	
@@ -18,7 +18,7 @@ else
     <MudTextField T="string" Disabled="@this.isAgentRunning" @bind-Text="@this.inputText" Validation="@this.ValidatingText" AdornmentIcon="@Icons.Material.Filled.DocumentScanner" Adornment="Adornment.Start" Label="Your input" Variant="Variant.Outlined" Lines="6" AutoGrow="@true" MaxLines="12" Class="mb-3" UserAttributes="@USER_INPUT_ATTRIBUTES"/>
 }
 
-<EnumSelection T="CommonLanguages" NameFunc="@(language => this.GetDisplayName(language))" @bind-Value="@this.selectedTargetLanguage" ValidateSelection="@this.ValidatingTargetLanguage" Icon="@Icons.Material.Filled.Translate" Label="Target language" AllowOther="@true" OtherValue="CommonLanguages.OTHER" @bind-OtherInput="@this.customTargetLanguage" ValidateOther="@this.ValidateCustomLanguage" LabelOther="Custom target language" />
+<EnumSelection T="CommonLanguages" NameFunc="@(language => language.NameSelecting())" @bind-Value="@this.selectedTargetLanguage" ValidateSelection="@this.ValidatingTargetLanguage" Icon="@Icons.Material.Filled.Translate" Label="Target language" AllowOther="@true" OtherValue="CommonLanguages.OTHER" @bind-OtherInput="@this.customTargetLanguage" ValidateOther="@this.ValidateCustomLanguage" LabelOther="Custom target language" />
 <MudSelect T="Provider" @bind-Value="@this.providerSettings" Disabled="@this.isAgentRunning" Validation="@this.ValidatingProvider" Adornment="Adornment.Start" AdornmentIcon="@Icons.Material.Filled.Apps" Margin="Margin.Dense" Label="Provider" Class="mb-3 rounded-lg" Variant="Variant.Outlined">
     @foreach (var provider in this.SettingsManager.ConfigurationData.Providers)
     {
diff --git a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs
index 9fccc651..6001556a 100644
--- a/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Translation/AssistantTranslation.razor.cs	
@@ -66,12 +66,6 @@ public partial class AssistantTranslation : AssistantBaseCore
         
         return null;
     }
-    
-    private string GetDisplayName(CommonLanguages language) => language switch
-    {
-        CommonLanguages.AS_IS => "Please select the target language",
-        _ => language.Name()
-    };
 
     private async Task TranslateText(bool force)
     {
@@ -85,7 +79,7 @@ public partial class AssistantTranslation : AssistantBaseCore
         this.CreateChatThread();
         var time = this.AddUserRequest(
             $"""
-                {this.selectedTargetLanguage.Prompt(this.customTargetLanguage)}
+                {this.selectedTargetLanguage.PromptTranslation(this.customTargetLanguage)}
                 
                 The given text is:
                 
diff --git a/app/MindWork AI Studio/Components/Pages/Translation/CommonLanguageExtension.cs b/app/MindWork AI Studio/Components/Pages/Translation/CommonLanguageExtension.cs
deleted file mode 100644
index 97dcbbc4..00000000
--- a/app/MindWork AI Studio/Components/Pages/Translation/CommonLanguageExtension.cs	
+++ /dev/null
@@ -1,13 +0,0 @@
-using AIStudio.Tools;
-
-namespace AIStudio.Components.Pages.Translation;
-
-public static class CommonLanguageExtension
-{
-    public static string Prompt(this CommonLanguages language, string customLanguage) => language switch
-    {
-        CommonLanguages.OTHER => $"Translate the text in {customLanguage}.",
-
-        _ => $"Translate the given text in {language.Name()} ({language}).",
-    };
-}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/CommonLanguageExtensions.cs b/app/MindWork AI Studio/Tools/CommonLanguageExtensions.cs
index 5d932a2a..57618b65 100644
--- a/app/MindWork AI Studio/Tools/CommonLanguageExtensions.cs	
+++ b/app/MindWork AI Studio/Tools/CommonLanguageExtensions.cs	
@@ -19,4 +19,27 @@ public static class CommonLanguageExtensions
             
         _ => "Other",
     };
+    
+    public static string PromptSummarizing(this CommonLanguages language, string customLanguage) => language switch
+    {
+        CommonLanguages.AS_IS => "Do not change the language of the text.",
+        CommonLanguages.OTHER => $"Output your summary in {customLanguage}.",
+
+        _ => $"Output your summary in {language.Name()} ({language}).",
+    };
+    
+    public static string PromptTranslation(this CommonLanguages language, string customLanguage) => language switch
+    {
+        CommonLanguages.OTHER => $"Translate the text in {customLanguage}.",
+
+        _ => $"Translate the given text in {language.Name()} ({language}).",
+    };
+
+    public static string NameSelecting(this CommonLanguages language)
+    {
+        if(language is CommonLanguages.AS_IS)
+            return "Please select the target language";
+        
+        return language.Name();
+    }
 }
\ No newline at end of file