diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh
index 8a25343205..e572ba940d 100755
--- a/firmware/gen_config_common.sh
+++ b/firmware/gen_config_common.sh
@@ -60,7 +60,7 @@ COMMON_GEN_CONFIG="
  -triggerInputFolder ../unit_tests \
  -with_c_defines false \
  -field_lookup_file controllers/lua/generated/value_lookup_generated.cpp controllers/lua/generated/value_lookup_generated.md \
- -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \
+ -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/ \
  -initialize_to_zero false \
  -signature ${META_OUTPUT_ROOT_FOLDER}tunerstudio/generated/signature_${SHORT_BOARD_NAME}.txt \
  -signature_destination controllers/generated/signature_${SHORT_BOARD_NAME}.h \
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
index e4860d94c7..2738653f05 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
@@ -97,7 +97,7 @@ public class ConfigDefinition {
                     state.destCDefinesFileName = args[i + 1];
                     break;
                 case KEY_JAVA_DESTINATION:
-                    state.addJavaDestination(args[i + 1]);
+                    state.addJavaDestination(args[i + 1] + "Fields.java");
                     break;
                 case "-field_lookup_file": {
                     String cppFile = args[i + 1];