diff --git a/APMrover2/APMrover2.pde b/APMrover2/APMrover2.pde
index 5aaeb6b1a7..0a17269dfb 100644
--- a/APMrover2/APMrover2.pde
+++ b/APMrover2/APMrover2.pde
@@ -103,7 +103,7 @@
 #include <AP_Frsky_Telem.h>
 
 #include <AP_HAL_AVR.h>
-#include <AP_HAL_AVR_SITL.h>
+#include <AP_HAL_SITL.h>
 #include <AP_HAL_PX4.h>
 #include <AP_HAL_VRBRAIN.h>
 #include <AP_HAL_FLYMAPLE.h>
@@ -242,7 +242,7 @@ AP_Mission mission(ahrs, &start_command, &verify_command, &exit_mission);
 
 static OpticalFlow optflow;
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 SITL sitl;
 #endif
 
diff --git a/APMrover2/GCS_Mavlink.pde b/APMrover2/GCS_Mavlink.pde
index 6b2c61ee6a..daebe49ee9 100644
--- a/APMrover2/GCS_Mavlink.pde
+++ b/APMrover2/GCS_Mavlink.pde
@@ -312,7 +312,7 @@ static void NOINLINE send_vfr_hud(mavlink_channel_t chan)
 // report simulator state
 static void NOINLINE send_simstate(mavlink_channel_t chan)
 {
-#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
     sitl.simstate_send(chan);
 #endif
 }
diff --git a/APMrover2/Parameters.pde b/APMrover2/Parameters.pde
index 724c25ab09..0b5082a02a 100644
--- a/APMrover2/Parameters.pde
+++ b/APMrover2/Parameters.pde
@@ -471,7 +471,7 @@ const AP_Param::Info var_info[] PROGMEM = {
     // @Path: ../libraries/AP_InertialSensor/AP_InertialSensor.cpp
     GOBJECT(ins,                            "INS_", AP_InertialSensor),
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
     // @Group: SIM_
     // @Path: ../libraries/SITL/SITL.cpp
     GOBJECT(sitl, "SIM_", SITL),
diff --git a/APMrover2/config.h b/APMrover2/config.h
index 5643ec3bbd..1ae7e38372 100644
--- a/APMrover2/config.h
+++ b/APMrover2/config.h
@@ -64,7 +64,7 @@
 #elif CONFIG_HAL_BOARD == HAL_BOARD_APM2
 # define BATTERY_PIN_1	  1
 # define CURRENT_PIN_1	  2
-#elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
+#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
 # define BATTERY_PIN_1	  1
 # define CURRENT_PIN_1	  2
 #elif CONFIG_HAL_BOARD == HAL_BOARD_PX4