diff --git a/src/slic3r/GUI/DeviceCore/DevDefs.h b/src/slic3r/GUI/DeviceCore/DevDefs.h
index 468ed0184a..7cbf4d26c4 100644
--- a/src/slic3r/GUI/DeviceCore/DevDefs.h
+++ b/src/slic3r/GUI/DeviceCore/DevDefs.h
@@ -40,6 +40,15 @@ enum AmsStatusMain
     AMS_STATUS_MAIN_UNKNOWN = 0xFF,
 };
 
+enum DevAmsType : int
+{
+    EXT_SPOOL = 0,      // EXT
+    AMS = 1,            // AMS1
+    AMS_LITE = 2,       // AMS-Lite
+    N3F = 3,            // N3F, AMS 2PRO
+    N3S = 4,            // N3S, AMS HT
+};
+
 // Slots and Tray
 #define VIRTUAL_TRAY_MAIN_ID    255
 #define VIRTUAL_TRAY_DEPUTY_ID  254
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
index 8f35ccf454..100e4c30e9 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp
@@ -111,7 +111,7 @@ DevAms::DevAms(const std::string& ams_id, int nozzle_id, int type)
     m_ams_id = ams_id;
     m_ext_id = nozzle_id;
     m_ams_type = (AmsType)type;
-    assert(DUMMY < type && m_ams_type <= N3S);
+    assert(EXT_SPOOL < type && m_ams_type <= N3S);
 }
 
 DevAms::~DevAms()
diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h
index 37a93729c8..9d5e2f748c 100644
--- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h
+++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h
@@ -130,14 +130,12 @@ class DevAms
 {
     friend class DevFilaSystemParser;
 public:
-    enum AmsType : int
-    {
-        DUMMY = 0,
-        AMS = 1,      // AMS
-        AMS_LITE = 2, // AMS-Lite
-        N3F = 3,      // N3F
-        N3S = 4,      // N3S
-    };
+    using AmsType = DevAmsType;
+    static constexpr AmsType EXT_SPOOL = DevAmsType::EXT_SPOOL;
+    static constexpr AmsType AMS = DevAmsType::AMS;
+    static constexpr AmsType AMS_LITE = DevAmsType::AMS_LITE;
+    static constexpr AmsType N3F = DevAmsType::N3F;
+    static constexpr AmsType N3S = DevAmsType::N3S;
 
 public:
     DevAms(const std::string& ams_id, int extruder_id, AmsType type);
diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.cpp b/src/slic3r/GUI/DeviceCore/DevMapping.cpp
index af3539f372..a98b6402e8 100644
--- a/src/slic3r/GUI/DeviceCore/DevMapping.cpp
+++ b/src/slic3r/GUI/DeviceCore/DevMapping.cpp
@@ -186,7 +186,7 @@ namespace Slic3r
                         }
                     }
                     FilamentInfo info;
-                    _parse_tray_info(atoi(tray.id.c_str()), 0, DevAms::DUMMY, tray, info);
+                    _parse_tray_info(atoi(tray.id.c_str()), 0, DevAms::EXT_SPOOL, tray, info);
                     tray_filaments.emplace(std::make_pair(info.tray_id, info));
                 }
             }