diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml
index 4b22c60898..9b770db503 100644
--- a/.github/workflows/build-simulator.yaml
+++ b/.github/workflows/build-simulator.yaml
@@ -67,7 +67,6 @@ jobs:
         git add 'simulator/generated/*xml'
         # get the original ramdisk images back in order to not overwrite the default placeholder
         git checkout -- firmware/hw_layer/mass_storage/ramdisk_image.h firmware/hw_layer/mass_storage/ramdisk_image_compressed.h
-        git checkout -- java_tools/enum2string.jar
         git status
         OUT=$(git commit -am "Auto-generated default tune" 2>&1) || echo "commit failed, finding out why"
         if echo "$OUT" | grep 'nothing to commit'; then
diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml
index f4d3dac514..270542f319 100644
--- a/.github/workflows/gen-configs.yaml
+++ b/.github/workflows/gen-configs.yaml
@@ -75,7 +75,6 @@ jobs:
         git add *_generated.h
         # get the original ramdisk images back in order to not overwrite the default placeholder
         git checkout -- firmware/hw_layer/mass_storage/ramdisk_image.h firmware/hw_layer/mass_storage/ramdisk_image_compressed.h
-        git checkout -- java_tools/enum2string.jar
         git status
         OUT=$(git commit -am "Auto-generated configs and docs" 2>&1) || echo "commit failed, finding out why"
         if echo "$OUT" | grep 'nothing to commit'; then
diff --git a/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh b/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh
index 49ad4fec18..9093c02f0c 100755
--- a/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh
+++ b/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh
@@ -5,7 +5,7 @@
 cd ../../../../..
 
 java -DSystemOut.name=logs/gen_enum_to_string_hellen_cypress \
- -jar ../java_tools/enum2string.jar \
+ -jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
  -outputPath config/boards/сypress/config/controllers/algo \
  -enumInputFile config/boards/cypress/rusefi_hw_enums.h
 
diff --git a/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh b/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
index 85e65b1455..5d7cd94a84 100755
--- a/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
+++ b/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
@@ -3,7 +3,7 @@
 cd ../../../..
 
 java -DSystemOut.name=logs/gen_enum_to_string_kinetis \
- -jar ../java_tools/enum2string.jar \
+ -jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
  -outputPath config/boards/kinetis/config/controllers/algo \
  -enumInputFile config/boards/kinetis/rusefi_hw_enums.h
 
diff --git a/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh b/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
index 71344501cd..e135aadeb4 100755
--- a/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
+++ b/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
@@ -8,7 +8,7 @@ echo This batch files reads rusefi_enums.h and produces auto_generated_enums.* f
 BOARD=subaru_eg33
 
 java -DSystemOut.name=logs/gen_enum_to_string \
-    -jar ../java_tools/enum2string.jar \
+    -jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
     -inputPath . \
     -outputPath config/boards/${BOARD}/config/controllers/algo \
     -enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h
diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh
index dcb9fe8347..613761c172 100755
--- a/firmware/gen_enum_to_string.sh
+++ b/firmware/gen_enum_to_string.sh
@@ -8,7 +8,7 @@ cd ../firmware
 
 rm gen_enum_to_string.log
 
-ENUM_JAR=../java_tools/enum2string.jar
+ENUM_JAR=../java_tools/enum_to_string/build/libs/enum_to_string.jar
 
 java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
 [ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; }
diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh
index b2514b36aa..9c0389261b 100755
--- a/firmware/gen_live_documentation.sh
+++ b/firmware/gen_live_documentation.sh
@@ -11,5 +11,5 @@ java -DSystemOut.name=logs/gen_live_documentation \
  com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
 [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
 
-java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum2string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
+java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum_to_string/build/libs/enum_to_string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
 [ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }
diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar
deleted file mode 100644
index ba97e75248..0000000000
Binary files a/java_tools/enum2string.jar and /dev/null differ
diff --git a/java_tools/enum_to_string/build.gradle b/java_tools/enum_to_string/build.gradle
index 87aca82cab..5235ea627a 100644
--- a/java_tools/enum_to_string/build.gradle
+++ b/java_tools/enum_to_string/build.gradle
@@ -14,10 +14,8 @@ shadowJar {
      to exclude suffix '-all'
      in resulting archive file name
     */
-    archiveBaseName = 'enum2string'
     archiveClassifier = ''
 
-    destinationDirectory = file( '$rootDir/../..' )
     manifest {
         attributes(
                 'Main-Class': 'com.rusefi.EnumToString'
diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToString.java b/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToString.java
index 542bc63032..9655470a7c 100644
--- a/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToString.java
+++ b/java_tools/enum_to_string/src/main/java/com/rusefi/EnumToString.java
@@ -20,7 +20,7 @@ public class EnumToString {
     /**
      * same header for .cpp and .h
      */
-    private final static StringBuilder commonFilesHeader = new StringBuilder("// by enum2string.jar tool " +
+    private final static StringBuilder commonFilesHeader = new StringBuilder("// by enum_to_string.jar tool " +
             "on " + new Date() + "\n" +
             "// see also gen_config_and_enums.bat\n" +
             "\n" +