diff --git a/ArduCopter/defines.h b/ArduCopter/defines.h
index 4b300b6bd6..53b82dcd56 100644
--- a/ArduCopter/defines.h
+++ b/ArduCopter/defines.h
@@ -125,11 +125,6 @@ enum SmartRTLState {
     SmartRTL_Land
 };
 
-enum LandStateType {
-    LandStateType_FlyToLocation = 0,
-    LandStateType_Descending = 1
-};
-
 enum PayloadPlaceStateType {
     PayloadPlaceStateType_FlyToLocation,
     PayloadPlaceStateType_Calibrating_Hover_Start,
diff --git a/ArduCopter/mode.h b/ArduCopter/mode.h
index c3fbd60b30..5f7c4b8aec 100644
--- a/ArduCopter/mode.h
+++ b/ArduCopter/mode.h
@@ -484,7 +484,11 @@ private:
     int32_t condition_value;  // used in condition commands (eg delay, change alt, etc.)
     uint32_t condition_start;
 
-    LandStateType land_state = LandStateType_FlyToLocation; // records state of land (flying to location, descending)
+    enum class State {
+        FlyToLocation = 0,
+        Descending = 1
+    };
+    State state = State::FlyToLocation;
 
     struct {
         PayloadPlaceStateType state = PayloadPlaceStateType_Calibrating_Hover_Start; // records state of place (descending, releasing, released, ...)
@@ -1471,4 +1475,4 @@ private:
     void warning_message(uint8_t message_n);    //Handles output messages to the terminal
 
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/ArduCopter/mode_auto.cpp b/ArduCopter/mode_auto.cpp
index 07282f40dc..129f13ffec 100644
--- a/ArduCopter/mode_auto.cpp
+++ b/ArduCopter/mode_auto.cpp
@@ -1166,14 +1166,14 @@ void ModeAuto::do_land(const AP_Mission::Mission_Command& cmd)
     // if location provided we fly to that location at current altitude
     if (cmd.content.location.lat != 0 || cmd.content.location.lng != 0) {
         // set state to fly to location
-        land_state = LandStateType_FlyToLocation;
+        state = State::FlyToLocation;
 
         const Location target_loc = terrain_adjusted_location(cmd);
 
         wp_start(target_loc);
     } else {
         // set landing state
-        land_state = LandStateType_Descending;
+        state = State::Descending;
 
         // initialise landing controller
         land_start();
@@ -1519,8 +1519,8 @@ bool ModeAuto::verify_land()
 {
     bool retval = false;
 
-    switch (land_state) {
-        case LandStateType_FlyToLocation:
+    switch (state) {
+        case State::FlyToLocation:
             // check if we've reached the location
             if (copter.wp_nav->reached_wp_destination()) {
                 // get destination so we can use it for loiter target
@@ -1530,11 +1530,11 @@ bool ModeAuto::verify_land()
                 land_start(dest);
 
                 // advance to next state
-                land_state = LandStateType_Descending;
+                state = State::Descending;
             }
             break;
 
-        case LandStateType_Descending:
+        case State::Descending:
             // rely on THROTTLE_LAND mode to correctly update landing status
             retval = copter.ap.land_complete && (motors->get_spool_state() == AP_Motors::SpoolState::GROUND_IDLE);
             break;