diff --git a/firmware/bundle.mk b/firmware/bundle.mk
index ee74052c0e..fdd243b4f8 100644
--- a/firmware/bundle.mk
+++ b/firmware/bundle.mk
@@ -66,9 +66,9 @@ ifneq ($(BUNDLE_SIMULATOR),false)
 endif
 
 UPDATE_CONSOLE_FOLDER_SOURCES = \
-  $(CONSOLE_OUT) \
-  $(TS_PLUGIN_LAUNCHER_OUT) \
-  $(AUTOUPDATE_OUT)
+  $(CONSOLE_JAR) \
+  $(TS_PLUGIN_LAUNCHER_JAR) \
+  $(AUTOUPDATE_JAR)
 
 # todo: remove BootCommander.exe once https://github.com/rusefi/rusefi/issues/6358 is done
 
diff --git a/firmware/docs_enums.mk b/firmware/docs_enums.mk
index fe0d4ede31..bbbae14d73 100644
--- a/firmware/docs_enums.mk
+++ b/firmware/docs_enums.mk
@@ -30,7 +30,7 @@ ifneq ("$(wildcard $(BOARD_DIR)/board_config.txt)","")
   DOCS_ENUMS_INPUTS += $(BOARD_DIR)/board_config.txt
 endif
 
-.docsenums-sentinel: $(DOCS_ENUMS_INPUTS) $(CONFIG_DEFINITION_BASE) $(ENUM_TO_STRING)
+.docsenums-sentinel: $(DOCS_ENUMS_INPUTS) $(CONFIG_DEFINITION_BASE_JAR) $(ENUM_TO_STRING_JAR)
 	bash $(PROJECT_DIR)/gen_live_documentation.sh
 	@touch $@
 
diff --git a/firmware/rusefi_config.mk b/firmware/rusefi_config.mk
index 9a48f7fb17..6e34fa4417 100644
--- a/firmware/rusefi_config.mk
+++ b/firmware/rusefi_config.mk
@@ -71,7 +71,7 @@ $(CONFIG_FILES): .config-sentinel ;
 
 # CONFIG_DEFINITION is always rebuilt, but the file will only be updated if it needs to be,
 # so it won't trigger a config file generation unless it needs to.
-.config-sentinel: $(CONFIG_INPUTS) $(CONFIG_DEFINITION) $(TGT_SENTINEL)
+.config-sentinel: $(CONFIG_INPUTS) $(CONFIG_DEFINITION_JAR) $(TGT_SENTINEL)
 ifneq (,$(CUSTOM_GEN_CONFIG))
 	bash $(BOARD_DIR)/$(CUSTOM_GEN_CONFIG)
 else
diff --git a/java_tools/java_tools.mk b/java_tools/java_tools.mk
index 8d3d060e51..d5b60ebf71 100644
--- a/java_tools/java_tools.mk
+++ b/java_tools/java_tools.mk
@@ -11,37 +11,37 @@ FLOCK = flock -o /tmp/java.lock
 
 FIELDS =   $(PROJECT_DIR)/../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
 
-CONFIG_DEFINITION = $(JAVA_TOOLS)/configuration_definition/build/libs/config_definition-all.jar
-CONFIG_DEFINITION_BASE = $(JAVA_TOOLS)/configuration_definition_base/build/libs/config_definition_base-all.jar
-ENUM_TO_STRING = $(JAVA_TOOLS)/enum_to_string/build/libs/enum_to_string-all.jar
-TUNE_TOOLS = $(JAVA_TOOLS)/tune-tools/build/libs/tune-tools-all.jar
-TS_PLUGIN_LAUNCHER_OUT = $(JAVA_TOOLS)/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar
-CONSOLE_OUT = $(PROJECT_DIR)/../java_console_binary/rusefi_console.jar
-AUTOUPDATE_OUT = $(PROJECT_DIR)/../java_console_binary/rusefi_autoupdate.jar
+CONFIG_DEFINITION_JAR = $(JAVA_TOOLS)/configuration_definition/build/libs/config_definition-all.jar
+CONFIG_DEFINITION_BASE_JAR = $(JAVA_TOOLS)/configuration_definition_base/build/libs/config_definition_base-all.jar
+ENUM_TO_STRING_JAR = $(JAVA_TOOLS)/enum_to_string/build/libs/enum_to_string-all.jar
+# TUNE_TOOLS_JAR = $(JAVA_TOOLS)/tune-tools/build/libs/tune-tools-all.jar
+TS_PLUGIN_LAUNCHER_JAR = $(JAVA_TOOLS)/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar
+CONSOLE_JAR = $(PROJECT_DIR)/../java_console_binary/rusefi_console.jar
+AUTOUPDATE_JAR = $(PROJECT_DIR)/../java_console_binary/rusefi_autoupdate.jar
 
 # We use .FORCE to always rebuild these tools. Gradle won't actually touch the jars if it doesn't need to,
 # so we don't have to worry about triggering rebuilds of things that have these tools as a prerequisite.
 
-$(CONFIG_DEFINITION): .FORCE
+$(CONFIG_DEFINITION_JAR): .FORCE
 	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :config_definition:shadowJar
 
-$(CONFIG_DEFINITION_BASE): .FORCE
+$(CONFIG_DEFINITION_BASE_JAR): .FORCE
 	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :config_definition_base:shadowJar
 
-$(ENUM_TO_STRING): .FORCE
+$(ENUM_TO_STRING_JAR): .FORCE
 	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :enum_to_string:shadowJar
 
-$(TUNE_TOOLS):
-	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :tune-tools:shadowJar
+#$(TUNE_TOOLS_JAR):
+	#cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :tune-tools:shadowJar
 
-$(TS_PLUGIN_LAUNCHER_OUT): .FORCE
+$(TS_PLUGIN_LAUNCHER_JAR): .FORCE
 	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :ts_plugin_launcher:shadowJar
 
 # The console depends on Fields.java.
-$(CONSOLE_OUT): $(FIELDS) .FORCE
+$(CONSOLE_JAR): $(FIELDS) .FORCE
 	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :ui:shadowJar
 
-$(AUTOUPDATE_OUT): .FORCE
+$(AUTOUPDATE_JAR): .FORCE
 	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :autoupdate:jar
 
 .FORCE: