diff --git a/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt b/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
index 61094db8ed001dc273f3bd6e1fe9e80fbe141872..b49606137894d4c5e40030fdb5b3699d16b66ac1 100644
--- a/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
+++ b/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr/platform.local.txt
@@ -1,4 +1,4 @@
-compiler.cpp.extra_flags=-DHAS_AUTOMATIC_VERSIONING
+compiler.cpp.extra_flags=-DUSE_AUTOMATIC_VERSIONING
 build.custom_bin.path.macosx=/usr/local/bin/
 build.custom_bin.path.linux=
 recipe.hooks.prebuild0.pattern={build.custom_bin.path}generate_version_header_for_marlin "{build.source.path}" "{build.path}/_Version.h"
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 71679be04124d78da638dbe0325e02f3ea968e20..b6e12ee595a3abb2b4e22c0422ab355b2b1bcd47 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index d225bc4c27138baa41da66aa9faea392522aa2ec..14368839a487192a904bf99a5a936fbe03f6cbd3 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -382,4 +382,8 @@
     #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
   #endif
 
+  #ifdef HAS_AUTOMATIC_VERSIONING
+    #error HAS_AUTOMATIC_VERSIONING deprecated - use USE_AUTOMATIC_VERSIONING instead
+  #endif
+
 #endif //SANITYCHECK_H
diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h
index 71679be04124d78da638dbe0325e02f3ea968e20..b6e12ee595a3abb2b4e22c0422ab355b2b1bcd47 100644
--- a/Marlin/configurator/config/Configuration.h
+++ b/Marlin/configurator/config/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h
index b421dd946f1d244814c272f842a7556b40f63f02..9d64482c11752a89f555bdff73dc83fb17b9ae07 100644
--- a/Marlin/configurator/config/language.h
+++ b/Marlin/configurator/config/language.h
@@ -38,7 +38,7 @@
   #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
 #endif
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #endif
 
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index d54687c970cd80592d4cc1aeb1514f84f6c7a143..1d6b8d6fa5d1637bde0e8c992866fdbdb2f78bc0 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h
index 1b57f282175307eb659289b76c27bd971d124c8b..289a2a41ffef183ce5148f10f38d35623931876c 100644
--- a/Marlin/example_configurations/Felix/Configuration_DUAL.h
+++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index 7d1487bdc11d87fcd71129572b19b0d417f5108d..e988fc732132901f8805ff757ce462ebb45e3516 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index 123620ca2dd7dbcc45d8e6ed0ff688c05c0a0ce9..3755b6e8cb90286cb48c9c5ba8d0ef0ebd4b120d 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -43,7 +43,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index adb460ff3990cf7d076773bd9424b1299a2caff9..dec00d78de72a50a53b5604c4777e717b11fef15 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index f48ade2ba62270471633fc820e687a8484a4048e..e7f5d6a05242961878ab82fe127946fd725aba63 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 957405b467fedcf26d1981358df0ecba7c48c301..785beb703285eb94c0fede56b8a92ffaadc9e1a3 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -63,7 +63,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index 4523ef9504d1ac35f710e277e15cd5a6496bba41..1777a553b7049cd83b0908640f7505058502ff96 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index 179b9f2dece6c467873b405252094c6c245941dd..975c6cae9650edbb9c98a863bc14733f73bd046c 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index cca54a993f11549d34d6c71cd87948f30c3f726a..23c704842ce35ec0021a14fa91ef300219904e56 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 521cfcae11cc774854ff7ce5db6524dfc822b48f..8a0448e9d8de1dce652fde66cc56783d545d766d 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 07bedbbb1e03808dcd2eed140522e49b4b4da27c..3c34e231a6a7fa6db2f9920ab80d633716f8e4ef 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index 3f88166caf152614c110273fd9ac9dd988ae2d83..e62cfbc5ab35c7d2d3085177149371b42ee502c6 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -42,7 +42,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index 7ac1105f90805034ecddfad8ef42606af6396061..1b464d6311b7c3c0567d15cd495e0cf4e4e88658 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 8aba468434578fb70bbd5dc275bf3d0dd2bfe174..d2acfc0eb589f7d87bf6b361430312065dafe1b7 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -38,7 +38,7 @@ Here are some standard links for getting your machine calibrated:
 
 // @section info
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #else
   #include "Default_Version.h"
diff --git a/Marlin/language.h b/Marlin/language.h
index b421dd946f1d244814c272f842a7556b40f63f02..9d64482c11752a89f555bdff73dc83fb17b9ae07 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -38,7 +38,7 @@
   #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
 #endif
 
-#if ENABLED(HAS_AUTOMATIC_VERSIONING)
+#if ENABLED(USE_AUTOMATIC_VERSIONING)
   #include "_Version.h"
 #endif