diff --git a/libraries/AP_Generator/AP_Generator.cpp b/libraries/AP_Generator/AP_Generator.cpp
index c8ffc8a274..78309a80e9 100644
--- a/libraries/AP_Generator/AP_Generator.cpp
+++ b/libraries/AP_Generator/AP_Generator.cpp
@@ -15,7 +15,7 @@
 
 #include "AP_Generator.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 #include "AP_Generator_IE_650_800.h"
 #include "AP_Generator_IE_2400.h"
diff --git a/libraries/AP_Generator/AP_Generator.h b/libraries/AP_Generator/AP_Generator.h
index 1c37aee4dc..b6b37959cc 100644
--- a/libraries/AP_Generator/AP_Generator.h
+++ b/libraries/AP_Generator/AP_Generator.h
@@ -2,11 +2,11 @@
 
 #include <AP_HAL/AP_HAL.h>
 
-#ifndef GENERATOR_ENABLED
-#define GENERATOR_ENABLED !HAL_MINIMIZE_FEATURES && !defined(HAL_BUILD_AP_PERIPH)
+#ifndef HAL_GENERATOR_ENABLED
+#define HAL_GENERATOR_ENABLED !HAL_MINIMIZE_FEATURES && !defined(HAL_BUILD_AP_PERIPH)
 #endif
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 #include <AP_Param/AP_Param.h>
 #include <GCS_MAVLink/GCS.h>
diff --git a/libraries/AP_Generator/AP_Generator_Backend.cpp b/libraries/AP_Generator/AP_Generator_Backend.cpp
index 9a7367eb7a..df19859c83 100644
--- a/libraries/AP_Generator/AP_Generator_Backend.cpp
+++ b/libraries/AP_Generator/AP_Generator_Backend.cpp
@@ -14,7 +14,7 @@
  */
 #include "AP_Generator_Backend.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 // Base class consructor
 AP_Generator_Backend::AP_Generator_Backend(AP_Generator& frontend) :
diff --git a/libraries/AP_Generator/AP_Generator_Backend.h b/libraries/AP_Generator/AP_Generator_Backend.h
index 28ea54ee43..8d1417ada2 100644
--- a/libraries/AP_Generator/AP_Generator_Backend.h
+++ b/libraries/AP_Generator/AP_Generator_Backend.h
@@ -2,7 +2,7 @@
 
 #include "AP_Generator.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 class AP_Generator_Backend
 {
diff --git a/libraries/AP_Generator/AP_Generator_IE_2400.cpp b/libraries/AP_Generator/AP_Generator_IE_2400.cpp
index 344d86d349..e95a9009ea 100644
--- a/libraries/AP_Generator/AP_Generator_IE_2400.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_2400.cpp
@@ -15,7 +15,7 @@
 
 #include "AP_Generator_IE_2400.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 #include <AP_Logger/AP_Logger.h>
 
diff --git a/libraries/AP_Generator/AP_Generator_IE_2400.h b/libraries/AP_Generator/AP_Generator_IE_2400.h
index 8ae995e31a..5bace66713 100644
--- a/libraries/AP_Generator/AP_Generator_IE_2400.h
+++ b/libraries/AP_Generator/AP_Generator_IE_2400.h
@@ -2,7 +2,7 @@
 
 #include "AP_Generator_IE_FuelCell.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 class AP_Generator_IE_2400 : public AP_Generator_IE_FuelCell
 {
diff --git a/libraries/AP_Generator/AP_Generator_IE_650_800.cpp b/libraries/AP_Generator/AP_Generator_IE_650_800.cpp
index cee3511309..dda28f1950 100644
--- a/libraries/AP_Generator/AP_Generator_IE_650_800.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_650_800.cpp
@@ -15,7 +15,7 @@
 
 #include "AP_Generator_IE_650_800.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_Generator/AP_Generator_IE_650_800.h b/libraries/AP_Generator/AP_Generator_IE_650_800.h
index c90421e9f8..9f3e48786b 100644
--- a/libraries/AP_Generator/AP_Generator_IE_650_800.h
+++ b/libraries/AP_Generator/AP_Generator_IE_650_800.h
@@ -2,7 +2,7 @@
 
 #include "AP_Generator_IE_FuelCell.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 class AP_Generator_IE_650_800 : public AP_Generator_IE_FuelCell
 {
diff --git a/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp b/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
index db3791478f..46a4312f4b 100644
--- a/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
+++ b/libraries/AP_Generator/AP_Generator_IE_FuelCell.cpp
@@ -16,7 +16,7 @@
 #include "AP_Generator_IE_FuelCell.h"
 #include <AP_SerialManager/AP_SerialManager.h>
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 // Initialize the fuelcell object and prepare it for use
 void AP_Generator_IE_FuelCell::init()
diff --git a/libraries/AP_Generator/AP_Generator_IE_FuelCell.h b/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
index 7b50018743..7ba662ec21 100644
--- a/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
+++ b/libraries/AP_Generator/AP_Generator_IE_FuelCell.h
@@ -2,7 +2,7 @@
 
 #include "AP_Generator_Backend.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 #include <AP_Param/AP_Param.h>
 #include <GCS_MAVLink/GCS.h>
diff --git a/libraries/AP_Generator/AP_Generator_RichenPower.cpp b/libraries/AP_Generator/AP_Generator_RichenPower.cpp
index 84177d483f..66b1ec073d 100644
--- a/libraries/AP_Generator/AP_Generator_RichenPower.cpp
+++ b/libraries/AP_Generator/AP_Generator_RichenPower.cpp
@@ -15,7 +15,7 @@
 
 #include "AP_Generator_RichenPower.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 #include <AP_Logger/AP_Logger.h>
 #include <AP_SerialManager/AP_SerialManager.h>
diff --git a/libraries/AP_Generator/AP_Generator_RichenPower.h b/libraries/AP_Generator/AP_Generator_RichenPower.h
index 94fdc3b01a..3acf33566c 100644
--- a/libraries/AP_Generator/AP_Generator_RichenPower.h
+++ b/libraries/AP_Generator/AP_Generator_RichenPower.h
@@ -3,7 +3,7 @@
 
 #include "AP_Generator_Backend.h"
 
-#if GENERATOR_ENABLED
+#if HAL_GENERATOR_ENABLED
 
 #include <AP_Common/AP_Common.h>
 #include <SRV_Channel/SRV_Channel.h>