diff --git a/compiler/core/build.xml b/compiler/core/build.xml
index 1936836fb..04dddd2e4 100644
--- a/compiler/core/build.xml
+++ b/compiler/core/build.xml
@@ -13,7 +13,7 @@ zserio_core.build_dir   - Directory where to put generated files.
 zserio_core.install_dir - Directory where to install Zserio core jar file.
                           Default is "${zserio.install_dir}/zserio_libs".
 zserio.version          - Zserio version to be used for Zserio core. Default is "unknown".
-clang_format.exe_file   - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file  - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir       - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -206,13 +206,13 @@ spotbugs.home_dir       - Location of the spotbugs tool. If not set, spotbugs is
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -262,13 +262,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/compiler/extensions/cpp/build.xml b/compiler/extensions/cpp/build.xml
index 56f0df5d8..53fd02b96 100644
--- a/compiler/extensions/cpp/build.xml
+++ b/compiler/extensions/cpp/build.xml
@@ -18,7 +18,7 @@ zserio_cpp.install_dir        - Directory where to install Zserio C++ Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -162,13 +162,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -219,13 +219,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/compiler/extensions/doc/build.xml b/compiler/extensions/doc/build.xml
index 7d3b21fcb..0dff03258 100644
--- a/compiler/extensions/doc/build.xml
+++ b/compiler/extensions/doc/build.xml
@@ -19,7 +19,7 @@ zserio_doc.install_dir        - Directory where to install Zserio Doc Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -185,13 +185,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/compiler/extensions/java/build.xml b/compiler/extensions/java/build.xml
index c9874adfd..cd70ccb3c 100644
--- a/compiler/extensions/java/build.xml
+++ b/compiler/extensions/java/build.xml
@@ -18,7 +18,7 @@ zserio_java.install_dir       - Directory where to install Zserio Doc Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -151,13 +151,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/compiler/extensions/java/runtime/build.xml b/compiler/extensions/java/runtime/build.xml
index 95ddc998d..9f9fa1164 100644
--- a/compiler/extensions/java/runtime/build.xml
+++ b/compiler/extensions/java/runtime/build.xml
@@ -17,7 +17,7 @@ relational.sqlite.jar_file      - SQLite JDBC jar file.
                                   Default is "../../../../3rdparty/java/sqlitejdbc-3.39.4.jar".
 relational.validation           - Flag whether the support for low level validation is included.
                                   Default is "yes".
-clang_format.exe_file           - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file          - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir               - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -209,13 +209,13 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
                overwrite="true"/>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -279,13 +279,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/compiler/extensions/python/build.xml b/compiler/extensions/python/build.xml
index f88a3f6b0..94a85d7cb 100644
--- a/compiler/extensions/python/build.xml
+++ b/compiler/extensions/python/build.xml
@@ -18,7 +18,7 @@ zserio_python.install_dir     - Directory where to install Zserio Python Extensi
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -165,13 +165,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
@@ -221,13 +221,13 @@ Command hints to reformat source using clang-format tool:
         </javac>
     </target>
 
-    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exe_file">
+    <target name="test.clang_format" depends="spotbugs, test.compile" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/compiler/extensions/xml/build.xml b/compiler/extensions/xml/build.xml
index 6bf77761e..0fca46672 100644
--- a/compiler/extensions/xml/build.xml
+++ b/compiler/extensions/xml/build.xml
@@ -19,7 +19,7 @@ zserio_xml.install_dir        - Directory where to install Zserio Doc Extension
 zserio_core.jar_file          - Zserio core jar file used for classpath.
                                 Default is "${zserio_extensions.build_dir}/../core/${ant.java.version}/jar/
                                 zserio_core.jar".
-clang_format.exe_file         - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file        - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -150,13 +150,13 @@ spotbugs.home_dir             - Location of the spotbugs tool. If not set, spotb
         </copy>
     </target>
 
-    <target name="clang_format" depends="install" if="clang_format.exe_file">
+    <target name="clang_format" depends="install" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/scripts/common_tools.sh b/scripts/common_tools.sh
index 651634b98..adcd37dcf 100644
--- a/scripts/common_tools.sh
+++ b/scripts/common_tools.sh
@@ -684,7 +684,7 @@ compile_java()
     local ANT_TARGET="$1"; shift
 
     if [ -n "${CLANG_FORMAT_BIN}" ] ; then
-        ANT_PROPS+=("-Dclang_format.exe_file=${CLANG_FORMAT_BIN}")
+        ANT_PROPS+=("-Dclang_format.exec_file=${CLANG_FORMAT_BIN}")
     fi
 
     if [ -n "${SPOTBUGS_HOME}" ] ; then
diff --git a/test/arguments/allow_implicit_arrays/build.xml b/test/arguments/allow_implicit_arrays/build.xml
index 5c776633b..ffa11c826 100644
--- a/test/arguments/allow_implicit_arrays/build.xml
+++ b/test/arguments/allow_implicit_arrays/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="allow_implicit_arrays"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="allow_implicit_arrays"/>
     </target>
 
diff --git a/test/arguments/set_top_level_package/build.xml b/test/arguments/set_top_level_package/build.xml
index b7b05115e..f16b21861 100644
--- a/test/arguments/set_top_level_package/build.xml
+++ b/test/arguments/set_top_level_package/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="set_top_level_package"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="set_top_level_package"/>
     </target>
 
diff --git a/test/arguments/with_range_check_code/build.xml b/test/arguments/with_range_check_code/build.xml
index e7d476861..3ad7e18b7 100644
--- a/test/arguments/with_range_check_code/build.xml
+++ b/test/arguments/with_range_check_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="with_range_check_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="with_range_check_code"/>
     </target>
 
diff --git a/test/arguments/with_type_info_code/build.xml b/test/arguments/with_type_info_code/build.xml
index 86e3c949b..2b2ad40ff 100644
--- a/test/arguments/with_type_info_code/build.xml
+++ b/test/arguments/with_type_info_code/build.xml
@@ -25,7 +25,7 @@
         <testCompile testName="with_type_info_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="with_type_info_code"/>
     </target>
 
diff --git a/test/arguments/with_validation_code/build.xml b/test/arguments/with_validation_code/build.xml
index 12abbe9ac..fb655a554 100644
--- a/test/arguments/with_validation_code/build.xml
+++ b/test/arguments/with_validation_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="with_validation_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="with_validation_code"/>
     </target>
 
diff --git a/test/arguments/without_cross_extension_check/build.xml b/test/arguments/without_cross_extension_check/build.xml
index 24c5ea130..759393f4c 100644
--- a/test/arguments/without_cross_extension_check/build.xml
+++ b/test/arguments/without_cross_extension_check/build.xml
@@ -28,7 +28,7 @@
         <testCompile testName="without_cross_extension_check"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_cross_extension_check"/>
     </target>
 
diff --git a/test/arguments/without_pubsub_code/build.xml b/test/arguments/without_pubsub_code/build.xml
index c56a31fbe..54a054666 100644
--- a/test/arguments/without_pubsub_code/build.xml
+++ b/test/arguments/without_pubsub_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="without_pubsub_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_pubsub_code"/>
     </target>
 
diff --git a/test/arguments/without_service_code/build.xml b/test/arguments/without_service_code/build.xml
index b26086c4a..f8a122390 100644
--- a/test/arguments/without_service_code/build.xml
+++ b/test/arguments/without_service_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="without_service_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_service_code"/>
     </target>
 
diff --git a/test/arguments/without_writer_code/build.xml b/test/arguments/without_writer_code/build.xml
index 806ab96a0..3404b727b 100644
--- a/test/arguments/without_writer_code/build.xml
+++ b/test/arguments/without_writer_code/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="without_writer_code"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="without_writer_code"/>
     </target>
 
diff --git a/test/build.xml b/test/build.xml
index 47fe0dcd5..cb5ed8b19 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -8,7 +8,7 @@ zserio.release_dir              - Directory where to find Zserio release to test
 zserio_java_test.build_root_dir - Build directory where to put generated files.
                                   Default is "../build/test/java".
 zserio_java_test.test_suites    - Test suites. Default is "**".
-clang_format.exe_file           - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file          - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir               - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -199,11 +199,11 @@ spotbugs.home_dir               - Location of the spotbugs tool. If not set, spo
         <attribute name="srcPath" default="${@{testName}.base_dir}/java"/>
         <sequential>
             <echo>
-    Command hints to reformat source using clang-format tool:
+    Command hints to reformat source manually using clang-format tool (in case of format errors):
         git clang-format
         clang-format --style=file -i [SOURCE]
             </echo>
-            <apply executable="${clang_format.exe_file}" failonerror="true">
+            <apply executable="${clang_format.exec_file}" failonerror="true">
                 <arg value="--style=file"/>
                 <arg value="--dry-run"/>
                 <arg value="--Werror"/>
diff --git a/test/errors/alignment_error/build.xml b/test/errors/alignment_error/build.xml
index 00378812d..49000239a 100644
--- a/test/errors/alignment_error/build.xml
+++ b/test/errors/alignment_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="alignment_error" srcPath="${alignment_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="alignment_error" srcPath="${alignment_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/array_types_error/build.xml b/test/errors/array_types_error/build.xml
index d9e1adfa0..3585289a9 100644
--- a/test/errors/array_types_error/build.xml
+++ b/test/errors/array_types_error/build.xml
@@ -75,7 +75,7 @@
         <testCompile testName="array_types_error" srcPath="${array_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="array_types_error" srcPath="${array_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/bitmask_types_error/build.xml b/test/errors/bitmask_types_error/build.xml
index 97dc8c0bf..91a12fd47 100644
--- a/test/errors/bitmask_types_error/build.xml
+++ b/test/errors/bitmask_types_error/build.xml
@@ -37,7 +37,7 @@
         <testCompile testName="bitmask_types_error" srcPath="${bitmask_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="bitmask_types_error" srcPath="${bitmask_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/builtin_types_error/build.xml b/test/errors/builtin_types_error/build.xml
index 051b93289..7d10adf2e 100644
--- a/test/errors/builtin_types_error/build.xml
+++ b/test/errors/builtin_types_error/build.xml
@@ -31,7 +31,7 @@
         <testCompile testName="builtin_types_error" srcPath="${builtin_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="builtin_types_error" srcPath="${builtin_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/choice_types_error/build.xml b/test/errors/choice_types_error/build.xml
index 098416adf..9570cbbb4 100644
--- a/test/errors/choice_types_error/build.xml
+++ b/test/errors/choice_types_error/build.xml
@@ -38,7 +38,7 @@
         <testCompile testName="choice_types_error" srcPath="${choice_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="choice_types_error" srcPath="${choice_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/compatibility_error/build.xml b/test/errors/compatibility_error/build.xml
index cffb03841..a2be2b831 100644
--- a/test/errors/compatibility_error/build.xml
+++ b/test/errors/compatibility_error/build.xml
@@ -35,7 +35,7 @@
         <testCompile testName="compatibility_error" srcPath="${compatibility_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="compatibility_error" srcPath="${compatibility_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/constants_error/build.xml b/test/errors/constants_error/build.xml
index bc3dc6707..986a94a61 100644
--- a/test/errors/constants_error/build.xml
+++ b/test/errors/constants_error/build.xml
@@ -32,7 +32,7 @@
         <testCompile testName="constants_error" srcPath="${constants_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="constants_error" srcPath="${constants_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/constraints_error/build.xml b/test/errors/constraints_error/build.xml
index 67d5c1a6e..e341dbb1e 100644
--- a/test/errors/constraints_error/build.xml
+++ b/test/errors/constraints_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="constraints_error" srcPath="${constraints_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="constraints_error" srcPath="${constraints_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/default_values_error/build.xml b/test/errors/default_values_error/build.xml
index 93c6c7b9a..4ab9924ba 100644
--- a/test/errors/default_values_error/build.xml
+++ b/test/errors/default_values_error/build.xml
@@ -27,7 +27,7 @@
         <testCompile testName="default_values_error" srcPath="${default_values_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="default_values_error" srcPath="${default_values_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/enumeration_types_error/build.xml b/test/errors/enumeration_types_error/build.xml
index e98c23155..7c5750706 100644
--- a/test/errors/enumeration_types_error/build.xml
+++ b/test/errors/enumeration_types_error/build.xml
@@ -36,7 +36,7 @@
         <testCompile testName="enumeration_types_error" srcPath="${enumeration_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="enumeration_types_error" srcPath="${enumeration_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/explicit_parameters_error/build.xml b/test/errors/explicit_parameters_error/build.xml
index 053a527b8..2c03c6954 100644
--- a/test/errors/explicit_parameters_error/build.xml
+++ b/test/errors/explicit_parameters_error/build.xml
@@ -23,7 +23,7 @@
         <testCompile testName="explicit_parameters_error" srcPath="${explicit_parameters_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="explicit_parameters_error"
                 srcPath="${explicit_parameters_error.base_dir}/java"/>
     </target>
diff --git a/test/errors/expressions_error/build.xml b/test/errors/expressions_error/build.xml
index 12916df7a..b6a64cc36 100644
--- a/test/errors/expressions_error/build.xml
+++ b/test/errors/expressions_error/build.xml
@@ -49,7 +49,7 @@
         <testCompile testName="expressions_error" srcPath="${expressions_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="expressions_error" srcPath="${expressions_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/extended_members_error/build.xml b/test/errors/extended_members_error/build.xml
index 28193993e..6611525a1 100644
--- a/test/errors/extended_members_error/build.xml
+++ b/test/errors/extended_members_error/build.xml
@@ -36,7 +36,7 @@
         <testCompile testName="extended_members_error" srcPath="${extended_members_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="extended_members_error" srcPath="${extended_members_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/functions_error/build.xml b/test/errors/functions_error/build.xml
index fe8198c4a..aeba72f0b 100644
--- a/test/errors/functions_error/build.xml
+++ b/test/errors/functions_error/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="functions_error" srcPath="${functions_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="functions_error" srcPath="${functions_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/identifiers_error/build.xml b/test/errors/identifiers_error/build.xml
index f0f396eae..4134f71c8 100644
--- a/test/errors/identifiers_error/build.xml
+++ b/test/errors/identifiers_error/build.xml
@@ -109,7 +109,7 @@
         <testCompile testName="identifiers_error" srcPath="${identifiers_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="identifiers_error" srcPath="${identifiers_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/indexed_offsets_error/build.xml b/test/errors/indexed_offsets_error/build.xml
index 2f33b6b06..8ee4a28c0 100644
--- a/test/errors/indexed_offsets_error/build.xml
+++ b/test/errors/indexed_offsets_error/build.xml
@@ -33,7 +33,7 @@
         <testCompile testName="indexed_offsets_error" srcPath="${indexed_offsets_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="indexed_offsets_error" srcPath="${indexed_offsets_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/java_generator_error/build.xml b/test/errors/java_generator_error/build.xml
index 4b8a5a5b0..fae83f2e9 100644
--- a/test/errors/java_generator_error/build.xml
+++ b/test/errors/java_generator_error/build.xml
@@ -25,7 +25,7 @@
         <testCompile testName="java_generator_error" srcPath="${java_generator_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="java_generator_error" srcPath="${java_generator_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/literals_error/build.xml b/test/errors/literals_error/build.xml
index db0369484..7eadf3354 100644
--- a/test/errors/literals_error/build.xml
+++ b/test/errors/literals_error/build.xml
@@ -23,7 +23,7 @@
         <testCompile testName="literals_error" srcPath="${literals_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="literals_error" srcPath="${literals_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/member_access_error/build.xml b/test/errors/member_access_error/build.xml
index 8bab52472..dfbf2b6fb 100644
--- a/test/errors/member_access_error/build.xml
+++ b/test/errors/member_access_error/build.xml
@@ -19,7 +19,7 @@
         <testCompile testName="member_access_error" srcPath="${member_access_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="member_access_error" srcPath="${member_access_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/offsets_error/build.xml b/test/errors/offsets_error/build.xml
index 92f6fc716..40d638474 100644
--- a/test/errors/offsets_error/build.xml
+++ b/test/errors/offsets_error/build.xml
@@ -29,7 +29,7 @@
         <testCompile testName="offsets_error" srcPath="${offsets_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="offsets_error" srcPath="${offsets_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/optional_members_error/build.xml b/test/errors/optional_members_error/build.xml
index 9a9e1d39b..ac96c3f87 100644
--- a/test/errors/optional_members_error/build.xml
+++ b/test/errors/optional_members_error/build.xml
@@ -27,7 +27,7 @@
         <testCompile testName="optional_members_error" srcPath="${optional_members_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="optional_members_error" srcPath="${optional_members_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/packages_error/build.xml b/test/errors/packages_error/build.xml
index 77fbecf5f..592a8ae8e 100644
--- a/test/errors/packages_error/build.xml
+++ b/test/errors/packages_error/build.xml
@@ -30,7 +30,7 @@
         <testCompile testName="packages_error" srcPath="${packages_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="packages_error" srcPath="${packages_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/parameterized_types_error/build.xml b/test/errors/parameterized_types_error/build.xml
index 3a1face88..fa9da414c 100644
--- a/test/errors/parameterized_types_error/build.xml
+++ b/test/errors/parameterized_types_error/build.xml
@@ -43,7 +43,7 @@
         <testCompile testName="parameterized_types_error" srcPath="${parameterized_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="parameterized_types_error"
             srcPath="${parameterized_types_error.base_dir}/java"/>
     </target>
diff --git a/test/errors/pubsub_types_error/build.xml b/test/errors/pubsub_types_error/build.xml
index 713c94235..0f090c288 100644
--- a/test/errors/pubsub_types_error/build.xml
+++ b/test/errors/pubsub_types_error/build.xml
@@ -25,7 +25,7 @@
         <testCompile testName="pubsub_types_error" srcPath="${pubsub_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="pubsub_types_error" srcPath="${pubsub_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/rules_error/build.xml b/test/errors/rules_error/build.xml
index 4dd6c426c..d039af6c9 100644
--- a/test/errors/rules_error/build.xml
+++ b/test/errors/rules_error/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="rules_error" srcPath="${rules_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="rules_error" srcPath="${rules_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/service_types_error/build.xml b/test/errors/service_types_error/build.xml
index 15666c8cd..3d7866889 100644
--- a/test/errors/service_types_error/build.xml
+++ b/test/errors/service_types_error/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="service_types_error" srcPath="${service_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="service_types_error" srcPath="${service_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/sql_constraints_error/build.xml b/test/errors/sql_constraints_error/build.xml
index a339f0708..b465871dd 100644
--- a/test/errors/sql_constraints_error/build.xml
+++ b/test/errors/sql_constraints_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="sql_constraints_error" srcPath="${sql_constraints_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_constraints_error" srcPath="${sql_constraints_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/sql_databases_error/build.xml b/test/errors/sql_databases_error/build.xml
index 562fbb741..54764ecd9 100644
--- a/test/errors/sql_databases_error/build.xml
+++ b/test/errors/sql_databases_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="sql_databases_error" srcPath="${sql_databases_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_databases_error" srcPath="${sql_databases_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/sql_tables_error/build.xml b/test/errors/sql_tables_error/build.xml
index 8e28e5d47..0707bb481 100644
--- a/test/errors/sql_tables_error/build.xml
+++ b/test/errors/sql_tables_error/build.xml
@@ -29,7 +29,7 @@
         <testCompile testName="sql_tables_error" srcPath="${sql_tables_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_tables_error" srcPath="${sql_tables_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/sql_virtual_tables_error/build.xml b/test/errors/sql_virtual_tables_error/build.xml
index 99f8753d6..e4ba5cd6a 100644
--- a/test/errors/sql_virtual_tables_error/build.xml
+++ b/test/errors/sql_virtual_tables_error/build.xml
@@ -19,7 +19,7 @@
         <testCompile testName="sql_virtual_tables_error" srcPath="${sql_virtual_tables_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_virtual_tables_error"
             srcPath="${sql_virtual_tables_error.base_dir}/java"/>
     </target>
diff --git a/test/errors/sql_without_rowid_tables_error/build.xml b/test/errors/sql_without_rowid_tables_error/build.xml
index 1466e54b5..9761d3ed4 100644
--- a/test/errors/sql_without_rowid_tables_error/build.xml
+++ b/test/errors/sql_without_rowid_tables_error/build.xml
@@ -20,7 +20,7 @@
             srcPath="${sql_without_rowid_tables_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_without_rowid_tables_error"
             srcPath="${sql_without_rowid_tables_error.base_dir}/java"/>
     </target>
diff --git a/test/errors/structure_types_error/build.xml b/test/errors/structure_types_error/build.xml
index e78af78e3..d7d67a2e0 100644
--- a/test/errors/structure_types_error/build.xml
+++ b/test/errors/structure_types_error/build.xml
@@ -31,7 +31,7 @@
         <testCompile testName="structure_types_error" srcPath="${structure_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="structure_types_error" srcPath="${structure_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/subtypes_error/build.xml b/test/errors/subtypes_error/build.xml
index 6402d08ed..189adad70 100644
--- a/test/errors/subtypes_error/build.xml
+++ b/test/errors/subtypes_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="subtypes_error" srcPath="${subtypes_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="subtypes_error" srcPath="${subtypes_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/syntax_error/build.xml b/test/errors/syntax_error/build.xml
index 54c52a7d9..5756fcb5a 100644
--- a/test/errors/syntax_error/build.xml
+++ b/test/errors/syntax_error/build.xml
@@ -29,7 +29,7 @@
         <testCompile testName="syntax_error" srcPath="${syntax_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="syntax_error" srcPath="${syntax_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/templates_error/build.xml b/test/errors/templates_error/build.xml
index c7f23fae2..37976b517 100644
--- a/test/errors/templates_error/build.xml
+++ b/test/errors/templates_error/build.xml
@@ -71,7 +71,7 @@
         <testCompile testName="templates_error" srcPath="${templates_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="templates_error" srcPath="${templates_error.base_dir}/java"/>
     </target>
 
diff --git a/test/errors/union_types_error/build.xml b/test/errors/union_types_error/build.xml
index 42951748b..8ff0fe682 100644
--- a/test/errors/union_types_error/build.xml
+++ b/test/errors/union_types_error/build.xml
@@ -21,7 +21,7 @@
         <testCompile testName="union_types_error" srcPath="${union_types_error.base_dir}/java"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="union_types_error" srcPath="${union_types_error.base_dir}/java"/>
     </target>
 
diff --git a/test/language/alignment/build.xml b/test/language/alignment/build.xml
index 8e121ba1e..78c266173 100644
--- a/test/language/alignment/build.xml
+++ b/test/language/alignment/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="alignment"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="alignment"/>
     </target>
 
diff --git a/test/language/array_types/build.xml b/test/language/array_types/build.xml
index 8dd70caef..1bb39c266 100644
--- a/test/language/array_types/build.xml
+++ b/test/language/array_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="array_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="array_types"/>
     </target>
 
diff --git a/test/language/bitmask_types/build.xml b/test/language/bitmask_types/build.xml
index f612d26c8..8bf681a64 100644
--- a/test/language/bitmask_types/build.xml
+++ b/test/language/bitmask_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="bitmask_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="bitmask_types"/>
     </target>
 
diff --git a/test/language/builtin_types/build.xml b/test/language/builtin_types/build.xml
index a40808d0f..325640061 100644
--- a/test/language/builtin_types/build.xml
+++ b/test/language/builtin_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="builtin_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="builtin_types"/>
     </target>
 
diff --git a/test/language/choice_types/build.xml b/test/language/choice_types/build.xml
index 05f74d9bc..66e9ff9fb 100644
--- a/test/language/choice_types/build.xml
+++ b/test/language/choice_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="choice_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="choice_types"/>
     </target>
 
diff --git a/test/language/constants/build.xml b/test/language/constants/build.xml
index 4d9b1c0ec..d6c31b2ba 100644
--- a/test/language/constants/build.xml
+++ b/test/language/constants/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="constants"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="constants"/>
     </target>
 
diff --git a/test/language/constraints/build.xml b/test/language/constraints/build.xml
index 7875c3cfa..f4198c34d 100644
--- a/test/language/constraints/build.xml
+++ b/test/language/constraints/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="constraints"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="constraints"/>
     </target>
 
diff --git a/test/language/default_values/build.xml b/test/language/default_values/build.xml
index 384e1eb33..c252b1d2b 100644
--- a/test/language/default_values/build.xml
+++ b/test/language/default_values/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="default_values"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="default_values"/>
     </target>
 
diff --git a/test/language/enumeration_types/build.xml b/test/language/enumeration_types/build.xml
index 3a7668687..9602be79b 100644
--- a/test/language/enumeration_types/build.xml
+++ b/test/language/enumeration_types/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="enumeration_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="enumeration_types"/>
     </target>
 
diff --git a/test/language/explicit_parameters/build.xml b/test/language/explicit_parameters/build.xml
index 66e049d93..0ea270512 100644
--- a/test/language/explicit_parameters/build.xml
+++ b/test/language/explicit_parameters/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="explicit_parameters"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="explicit_parameters"/>
     </target>
 
diff --git a/test/language/expressions/build.xml b/test/language/expressions/build.xml
index f8361b169..e007bc241 100644
--- a/test/language/expressions/build.xml
+++ b/test/language/expressions/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="expressions"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="expressions"/>
     </target>
 
diff --git a/test/language/extended_members/build.xml b/test/language/extended_members/build.xml
index 56619c684..240919d5b 100644
--- a/test/language/extended_members/build.xml
+++ b/test/language/extended_members/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="extended_members"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="extended_members"/>
     </target>
 
diff --git a/test/language/functions/build.xml b/test/language/functions/build.xml
index c4445cabf..657c0cb56 100644
--- a/test/language/functions/build.xml
+++ b/test/language/functions/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="functions"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="functions"/>
     </target>
 
diff --git a/test/language/identifiers/build.xml b/test/language/identifiers/build.xml
index 740afdfb9..f5b5d6d33 100644
--- a/test/language/identifiers/build.xml
+++ b/test/language/identifiers/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="identifiers"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="identifiers"/>
     </target>
 
diff --git a/test/language/indexed_offsets/build.xml b/test/language/indexed_offsets/build.xml
index 4003794f9..f6559bcb3 100644
--- a/test/language/indexed_offsets/build.xml
+++ b/test/language/indexed_offsets/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="indexed_offsets"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="indexed_offsets"/>
     </target>
 
diff --git a/test/language/literals/build.xml b/test/language/literals/build.xml
index 09e6e6aee..d49dedc43 100644
--- a/test/language/literals/build.xml
+++ b/test/language/literals/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="literals"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="literals"/>
     </target>
 
diff --git a/test/language/member_access/build.xml b/test/language/member_access/build.xml
index ec015192c..a12ace092 100644
--- a/test/language/member_access/build.xml
+++ b/test/language/member_access/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="member_access"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="member_access"/>
     </target>
 
diff --git a/test/language/offsets/build.xml b/test/language/offsets/build.xml
index 220401cd3..45c96f2e4 100644
--- a/test/language/offsets/build.xml
+++ b/test/language/offsets/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="offsets"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="offsets"/>
     </target>
 
diff --git a/test/language/optional_members/build.xml b/test/language/optional_members/build.xml
index a30c3dd9a..586aec51f 100644
--- a/test/language/optional_members/build.xml
+++ b/test/language/optional_members/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="optional_members"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="optional_members"/>
     </target>
 
diff --git a/test/language/packages/build.xml b/test/language/packages/build.xml
index fae45c32f..2db56d4b3 100644
--- a/test/language/packages/build.xml
+++ b/test/language/packages/build.xml
@@ -27,7 +27,7 @@
         <testCompile testName="packages"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="packages"/>
     </target>
 
diff --git a/test/language/parameterized_types/build.xml b/test/language/parameterized_types/build.xml
index 3b63fed01..bed129199 100644
--- a/test/language/parameterized_types/build.xml
+++ b/test/language/parameterized_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="parameterized_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="parameterized_types"/>
     </target>
 
diff --git a/test/language/pubsub_types/build.xml b/test/language/pubsub_types/build.xml
index 7a0bfe1f1..b8129baa1 100644
--- a/test/language/pubsub_types/build.xml
+++ b/test/language/pubsub_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="pubsub_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="pubsub_types"/>
     </target>
 
diff --git a/test/language/service_types/build.xml b/test/language/service_types/build.xml
index 2541c48c1..e4b6f1ed9 100644
--- a/test/language/service_types/build.xml
+++ b/test/language/service_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="service_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="service_types"/>
     </target>
 
diff --git a/test/language/sql_constraints/build.xml b/test/language/sql_constraints/build.xml
index 3bafe6089..1902e54a9 100644
--- a/test/language/sql_constraints/build.xml
+++ b/test/language/sql_constraints/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="sql_constraints"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_constraints"/>
     </target>
 
diff --git a/test/language/sql_databases/build.xml b/test/language/sql_databases/build.xml
index 347f88981..76ace06a3 100644
--- a/test/language/sql_databases/build.xml
+++ b/test/language/sql_databases/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="sql_databases"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_databases"/>
     </target>
 
diff --git a/test/language/sql_tables/build.xml b/test/language/sql_tables/build.xml
index 1c33ebda0..e284483e4 100644
--- a/test/language/sql_tables/build.xml
+++ b/test/language/sql_tables/build.xml
@@ -23,7 +23,7 @@
         <testCompile testName="sql_tables"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_tables"/>
     </target>
 
diff --git a/test/language/sql_types/build.xml b/test/language/sql_types/build.xml
index 8aae6231e..6a2ab3a36 100644
--- a/test/language/sql_types/build.xml
+++ b/test/language/sql_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="sql_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_types"/>
     </target>
 
diff --git a/test/language/sql_virtual_columns/build.xml b/test/language/sql_virtual_columns/build.xml
index 22294eb24..602d71211 100644
--- a/test/language/sql_virtual_columns/build.xml
+++ b/test/language/sql_virtual_columns/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="sql_virtual_columns"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_virtual_columns"/>
     </target>
 
diff --git a/test/language/sql_virtual_tables/build.xml b/test/language/sql_virtual_tables/build.xml
index 3fda72da4..17c37d7e0 100644
--- a/test/language/sql_virtual_tables/build.xml
+++ b/test/language/sql_virtual_tables/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="sql_virtual_tables"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_virtual_tables"/>
     </target>
 
diff --git a/test/language/sql_without_rowid_tables/build.xml b/test/language/sql_without_rowid_tables/build.xml
index 61cddfd01..803207a23 100644
--- a/test/language/sql_without_rowid_tables/build.xml
+++ b/test/language/sql_without_rowid_tables/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="sql_without_rowid_tables"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_without_rowid_tables"/>
     </target>
 
diff --git a/test/language/structure_types/build.xml b/test/language/structure_types/build.xml
index f932de08b..a12c7b24d 100644
--- a/test/language/structure_types/build.xml
+++ b/test/language/structure_types/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="structure_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="structure_types"/>
     </target>
 
diff --git a/test/language/subtypes/build.xml b/test/language/subtypes/build.xml
index c2b7cd75b..fac53ee1f 100644
--- a/test/language/subtypes/build.xml
+++ b/test/language/subtypes/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="subtypes"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="subtypes"/>
     </target>
 
diff --git a/test/language/templates/build.xml b/test/language/templates/build.xml
index 6749379a7..9c18c70bd 100644
--- a/test/language/templates/build.xml
+++ b/test/language/templates/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="templates"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="templates"/>
     </target>
 
diff --git a/test/language/union_types/build.xml b/test/language/union_types/build.xml
index 2fa7a7e94..74b8bba31 100644
--- a/test/language/union_types/build.xml
+++ b/test/language/union_types/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="union_types"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="union_types"/>
     </target>
 
diff --git a/test/others/gif/build.xml b/test/others/gif/build.xml
index 2c5539888..9e5aee254 100644
--- a/test/others/gif/build.xml
+++ b/test/others/gif/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="gif"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="gif"/>
     </target>
 
diff --git a/test/utils/java/build.xml b/test/utils/java/build.xml
index cea132ddf..6da208478 100644
--- a/test/utils/java/build.xml
+++ b/test/utils/java/build.xml
@@ -6,7 +6,7 @@ The following properties can be set:
 
 test_utils.build_dir    - Directory where to put generated files.
                           Default is "../../../build/test/java/${ant.java.version}/utils".
-clang_format.exe_file   - Clang-format executable file. If not set, clang-format is not run.
+clang_format.exec_file  - Clang-format executable file. If not set, clang-format is not run.
 spotbugs.home_dir       - Location of the spotbugs tool. If not set, spotbugs is not run.
 
 -->
@@ -58,13 +58,13 @@ spotbugs.home_dir       - Location of the spotbugs tool. If not set, spotbugs is
         <delete dir="${test_utils.build_dir}"/>
     </target>
 
-    <target name="clang_format" depends="jar" if="clang_format.exe_file">
+    <target name="clang_format" depends="jar" if="clang_format.exec_file">
         <echo>
-Command hints to reformat source using clang-format tool:
+Command hints to reformat source manually using clang-format tool (in case of format errors):
     git clang-format
     clang-format --style=file -i [SOURCE]
         </echo>
-        <apply executable="${clang_format.exe_file}" failonerror="true">
+        <apply executable="${clang_format.exec_file}" failonerror="true">
             <arg value="--style=file"/>
             <arg value="--dry-run"/>
             <arg value="--Werror"/>
diff --git a/test/warnings/array_types_warning/build.xml b/test/warnings/array_types_warning/build.xml
index d087533fe..f54aef321 100644
--- a/test/warnings/array_types_warning/build.xml
+++ b/test/warnings/array_types_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="array_types_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="array_types_warning"/>
     </target>
 
diff --git a/test/warnings/choice_types_warning/build.xml b/test/warnings/choice_types_warning/build.xml
index fdbf81646..d02c6835f 100644
--- a/test/warnings/choice_types_warning/build.xml
+++ b/test/warnings/choice_types_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="choice_types_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="choice_types_warning"/>
     </target>
 
diff --git a/test/warnings/comments_warning/build.xml b/test/warnings/comments_warning/build.xml
index 55e954ffd..3a44b31d5 100644
--- a/test/warnings/comments_warning/build.xml
+++ b/test/warnings/comments_warning/build.xml
@@ -27,7 +27,7 @@
         <testCompile testName="comments_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="comments_warning"/>
     </target>
 
diff --git a/test/warnings/compatibility_warning/build.xml b/test/warnings/compatibility_warning/build.xml
index c23181150..f7dfd7507 100644
--- a/test/warnings/compatibility_warning/build.xml
+++ b/test/warnings/compatibility_warning/build.xml
@@ -29,7 +29,7 @@
         <testCompile testName="compatibility_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="compatibility_warning"/>
     </target>
 
diff --git a/test/warnings/file_encoding_warning/build.xml b/test/warnings/file_encoding_warning/build.xml
index 94cf160bf..0d6a86577 100644
--- a/test/warnings/file_encoding_warning/build.xml
+++ b/test/warnings/file_encoding_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="file_encoding_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="file_encoding_warning"/>
     </target>
 
diff --git a/test/warnings/functions_warning/build.xml b/test/warnings/functions_warning/build.xml
index 61418fcec..1cfefd92a 100644
--- a/test/warnings/functions_warning/build.xml
+++ b/test/warnings/functions_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="functions_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="functions_warning"/>
     </target>
 
diff --git a/test/warnings/not_handled_warning/build.xml b/test/warnings/not_handled_warning/build.xml
index 2ade534bf..21dc32b40 100644
--- a/test/warnings/not_handled_warning/build.xml
+++ b/test/warnings/not_handled_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="not_handled_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="not_handled_warning"/>
     </target>
 
diff --git a/test/warnings/optional_members_warning/build.xml b/test/warnings/optional_members_warning/build.xml
index e3452aeaa..8b6594d56 100644
--- a/test/warnings/optional_members_warning/build.xml
+++ b/test/warnings/optional_members_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="optional_members_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="optional_members_warning"/>
     </target>
 
diff --git a/test/warnings/packages_warning/build.xml b/test/warnings/packages_warning/build.xml
index 1738b3461..8bae9378d 100644
--- a/test/warnings/packages_warning/build.xml
+++ b/test/warnings/packages_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="packages_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="packages_warning"/>
     </target>
 
diff --git a/test/warnings/sql_tables_warning/build.xml b/test/warnings/sql_tables_warning/build.xml
index 6e0fbe14e..c386b5246 100644
--- a/test/warnings/sql_tables_warning/build.xml
+++ b/test/warnings/sql_tables_warning/build.xml
@@ -22,7 +22,7 @@
         <testCompile testName="sql_tables_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_tables_warning"/>
     </target>
 
diff --git a/test/warnings/sql_without_rowid_tables_warning/build.xml b/test/warnings/sql_without_rowid_tables_warning/build.xml
index 5ed8d03ba..595518fe4 100644
--- a/test/warnings/sql_without_rowid_tables_warning/build.xml
+++ b/test/warnings/sql_without_rowid_tables_warning/build.xml
@@ -23,7 +23,7 @@
         <testCompile testName="sql_without_rowid_tables_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="sql_without_rowid_tables_warning"/>
     </target>
 
diff --git a/test/warnings/templates_warning/build.xml b/test/warnings/templates_warning/build.xml
index b6d7d67cb..677166475 100644
--- a/test/warnings/templates_warning/build.xml
+++ b/test/warnings/templates_warning/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="templates_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="templates_warning"/>
     </target>
 
diff --git a/test/warnings/unused_type_warning/build.xml b/test/warnings/unused_type_warning/build.xml
index c88ef74c3..98b4631b0 100644
--- a/test/warnings/unused_type_warning/build.xml
+++ b/test/warnings/unused_type_warning/build.xml
@@ -24,7 +24,7 @@
         <testCompile testName="unused_type_warning"/>
     </target>
 
-    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+    <target name="clang_format" depends="compile" if="clang_format.exec_file">
         <testClangFormat testName="unused_type_warning"/>
     </target>