diff --git a/src/main/java/de/marhali/easyi18n/action/LocalizeItAction.java b/src/main/java/de/marhali/easyi18n/action/LocalizeItAction.java
index 1fe4fc9..e4b75ee 100644
--- a/src/main/java/de/marhali/easyi18n/action/LocalizeItAction.java
+++ b/src/main/java/de/marhali/easyi18n/action/LocalizeItAction.java
@@ -83,21 +83,8 @@ class LocalizeItAction extends AnAction {
         return flavorTemplate + "(\"" + key + "\")";
     }
 
-    private String convertKeyToNamingCase(String key,Project project) {
-        String newKey = key.toLowerCase();
-        newKey = newKey.replaceAll("\\s+", "_");
-
-        NamingConvention namingConvention = ProjectSettingsService.get(project).getState().getCaseFormat();
-        return (namingConvention == NamingConvention.CAMEL_CASE) ? convertKeyToCamelCase(newKey) : convertKeyToSnakeCase(newKey);
+    private String convertKeyToNamingCase(String key, Project project) {
+        return NamingConvention.convertKeyToConvention(key, ProjectSettingsService.get(project).getState().getCaseFormat());
     }
 
-    private String convertKeyToCamelCase(String key) {
-
-
-        return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, key);
-    }
-
-    private String convertKeyToSnakeCase(String key) {
-        return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_UNDERSCORE, key);
-    }
 }
diff --git a/src/main/java/de/marhali/easyi18n/settings/NamingConvention.java b/src/main/java/de/marhali/easyi18n/settings/NamingConvention.java
index 7fa9e16..e9a94ad 100644
--- a/src/main/java/de/marhali/easyi18n/settings/NamingConvention.java
+++ b/src/main/java/de/marhali/easyi18n/settings/NamingConvention.java
@@ -5,12 +5,10 @@ import com.google.common.base.CaseFormat;
 import java.util.Arrays;
 
 public enum NamingConvention {
-    SNAKE_CASE("Snake Case"),
-
     CAMEL_CASE("Camel Case"),
-
     CAMEL_CASE_UPPERCASE("Camel Case Uppercase"),
-    ;
+    SNAKE_CASE("Snake Case"),
+    SNAKE_CASE_UPPERCASE("Snake Case Uppercase");
 
     private final String name;
 
@@ -37,4 +35,28 @@ public enum NamingConvention {
                 .map(NamingConvention::getName)
                 .toArray(String[]::new);
     }
+
+    static public String convertKeyToConvention(String key, NamingConvention convention) {
+        String newKey = key.toLowerCase();
+        newKey = newKey.replaceAll("\\s+", "_");
+        return switch (convention) {
+            case SNAKE_CASE:
+                yield formatToSnakeCase(newKey, false);
+            case SNAKE_CASE_UPPERCASE:
+                yield formatToSnakeCase(newKey, true);
+            case CAMEL_CASE:
+                yield formatToCamelCase(newKey, false);
+            case CAMEL_CASE_UPPERCASE:
+                yield formatToCamelCase(newKey, true);
+
+        };
+    }
+
+    static private String formatToCamelCase(String key, boolean capitalized) {
+        return CaseFormat.LOWER_UNDERSCORE.to(capitalized ? CaseFormat.UPPER_CAMEL : CaseFormat.LOWER_CAMEL, key);
+    }
+
+    static private String formatToSnakeCase(String key, boolean capitalized) {
+        return CaseFormat.LOWER_UNDERSCORE.to(capitalized ? CaseFormat.UPPER_UNDERSCORE : CaseFormat.LOWER_UNDERSCORE, key);
+    }
 }