diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp
index fe1368b082..73d9ce18a9 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.cpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -545,7 +545,7 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
         else {
             PACalibIndexInfo select_index_info;
             select_index_info.tray_id = slot_id;
-            select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
+            select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
             select_index_info.cali_idx = -1;
             select_index_info.filament_id     = selected_ams_id;
             CalibUtils::select_PA_calib_result(select_index_info);
@@ -676,7 +676,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
         if (obj->cali_version >= 0) {
             PACalibIndexInfo select_index_info;
             select_index_info.tray_id = vt_tray;
-            select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
+            select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
 
             auto cali_select_id = m_comboBox_cali_result->GetSelection();
             if (m_pa_profile_items.size() > 0 && cali_select_id >= 0) {
@@ -715,7 +715,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
         if (obj->cali_version >= 0) {
             PACalibIndexInfo select_index_info;
             select_index_info.tray_id = cali_tray_id;
-            select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
+            select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
 
             auto cali_select_id = m_comboBox_cali_result->GetSelection();
             if (m_pa_profile_items.size() > 0 && cali_select_id > 0) {
@@ -878,7 +878,7 @@ void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_mi
     std::set<std::string> filament_id_set;
     PresetBundle *        preset_bundle = wxGetApp().preset_bundle;
     std::ostringstream    stream;
-    stream << std::fixed << std::setprecision(1) << obj->m_nozzle_data.nozzles[0].diameter;
+    stream << std::fixed << std::setprecision(1) << obj->m_extder_data.extders[0].diameter;
     std::string nozzle_diameter_str = stream.str();
     std::set<std::string> printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle(MachineObject::get_preset_printer_model_name(obj->printer_type), nozzle_diameter_str);
 
@@ -1044,7 +1044,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt)
     if (preset_bundle) {
         std::ostringstream stream;
         if (obj)
-            stream << std::fixed << std::setprecision(1) << obj->m_nozzle_data.nozzles[0].diameter;
+            stream << std::fixed << std::setprecision(1) << obj->m_extder_data.extders[0].diameter;
         std::string nozzle_diameter_str = stream.str();
         std::set<std::string> printer_names = preset_bundle->get_printer_names_by_printer_type_and_nozzle(MachineObject::get_preset_printer_model_name(obj->printer_type),
                                                                                                           nozzle_diameter_str);
diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp
index 22f84e43e0..2cc210c6c2 100644
--- a/src/slic3r/GUI/CaliHistoryDialog.cpp
+++ b/src/slic3r/GUI/CaliHistoryDialog.cpp
@@ -180,7 +180,7 @@ void HistoryWindow::on_device_connected(MachineObject* obj)
     int selection = 1;
     for (int i = 0; i < nozzle_diameter_list.size(); i++) {
         m_comboBox_nozzle_dia->AppendString(wxString::Format("%1.1f mm", nozzle_diameter_list[i]));
-        if (abs(curr_obj->m_nozzle_data.nozzles[0].diameter - nozzle_diameter_list[i]) < 1e-3) {
+        if (abs(curr_obj->m_extder_data.extders[0].diameter - nozzle_diameter_list[i]) < 1e-3) {
             selection = i;
         }
     }
@@ -507,7 +507,7 @@ wxArrayString NewCalibrationHistoryDialog::get_all_filaments(const MachineObject
     std::set<std::string> filament_id_set;
     std::set<std::string> printer_names;
     std::ostringstream    stream;
-    stream << std::fixed << std::setprecision(1) << obj->m_nozzle_data.nozzles[0].diameter;
+    stream << std::fixed << std::setprecision(1) << obj->m_extder_data.extders[0].diameter;
     std::string nozzle_diameter_str = stream.str();
 
     for (auto printer_it = preset_bundle->printers.begin(); printer_it != preset_bundle->printers.end(); printer_it++) {
@@ -624,7 +624,7 @@ NewCalibrationHistoryDialog::NewCalibrationHistoryDialog(wxWindow *parent, const
     static std::array<float, 4> nozzle_diameter_list = {0.2f, 0.4f, 0.6f, 0.8f};
     for (int i = 0; i < nozzle_diameter_list.size(); i++) {
         m_comboBox_nozzle_diameter->AppendString(wxString::Format("%1.1f mm", nozzle_diameter_list[i]));
-        if (abs(obj->m_nozzle_data.nozzles[0].diameter - nozzle_diameter_list[i]) < 1e-3) {
+        if (abs(obj->m_extder_data.extders[0].diameter - nozzle_diameter_list[i]) < 1e-3) {
             m_comboBox_nozzle_diameter->SetSelection(i);
         }
     }
diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index bc7500827a..65edb84581 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -497,7 +497,7 @@ void PressureAdvanceWizard::update(MachineObject* obj)
         if (obj->cali_version != -1 && obj->cali_version != cali_version) {
             cali_version = obj->cali_version;
             PACalibExtruderInfo cali_info;
-            cali_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
+            cali_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
             CalibUtils::emit_get_PA_calib_info(cali_info);
         }
     }
diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
index 8f438864d5..9cd780ff97 100644
--- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
@@ -495,8 +495,8 @@ float CalibrationCaliPage::get_selected_calibration_nozzle_dia(MachineObject* ob
         return obj->cali_selected_nozzle_dia;
 
     // return default nozzle if nozzle diameter is set
-    if (obj->m_nozzle_data.nozzles[0].diameter > 1e-3 && obj->m_nozzle_data.nozzles[0].diameter < 10.0f)
-        return obj->m_nozzle_data.nozzles[0].diameter;
+    if (obj->m_extder_data.extders[0].diameter > 1e-3 && obj->m_extder_data.extders[0].diameter < 10.0f)
+        return obj->m_extder_data.extders[0].diameter;
 
     // return 0.4 by default
     return 0.4;
diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
index 98e09e479b..7a01f38784 100644
--- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
@@ -1505,7 +1505,7 @@ void CalibrationPresetPage::init_with_machine(MachineObject* obj)
     // set nozzle value from machine
     bool nozzle_is_set = false;
     for (int i = 0; i < NOZZLE_LIST_COUNT; i++) {
-        if (abs(obj->m_nozzle_data.nozzles[0].diameter - nozzle_diameter_list[i]) < 1e-3) {
+        if (abs(obj->m_extder_data.extders[0].diameter - nozzle_diameter_list[i]) < 1e-3) {
             if (m_comboBox_nozzle_dia->GetCount() > i) {
                 m_comboBox_nozzle_dia->SetSelection(i);
                 nozzle_is_set = true;
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index f02059dcf9..e12ba39168 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -617,11 +617,11 @@ MachineObject::MachineObject(NetworkAgent* agent, std::string name, std::string
 
     has_ipcam = true; // default true
 
-    m_nozzle_data.current_nozzle_id = 0;
-    m_nozzle_data.target_nozzle_id = 0;
-    m_nozzle_data.total_nozzle_count = 1;
-    Nozzle nozzle;
-    m_nozzle_data.nozzles.push_back(nozzle);
+    m_extder_data.current_extder_id = 0;
+    m_extder_data.target_extder_id = 0;
+    m_extder_data.total_extder_count = 1;
+    Extder nozzle;
+    m_extder_data.extders.push_back(nozzle);
 }
 
 MachineObject::~MachineObject()
@@ -1175,7 +1175,7 @@ void MachineObject::reset_mapping_result(std::vector<FilamentInfo>& result)
 
 bool MachineObject::is_multi_extruders() const
 {
-    return m_nozzle_data.total_nozzle_count > 1;
+    return m_extder_data.total_extder_count > 1;
 }
 
 bool MachineObject::is_bbl_filament(std::string tag_uid)
@@ -3400,15 +3400,15 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
                         }
                         if (jj.contains("nozzle_temper")) {
                             if (jj["nozzle_temper"].is_number()) {
-                                if (m_nozzle_data.nozzles.size() == 1) {
-                                    m_nozzle_data.nozzles[0].temp = jj["nozzle_temper"].get<float>();
+                                if (m_extder_data.extders.size() == 1) {
+                                    m_extder_data.extders[0].temp = jj["nozzle_temper"].get<float>();
                                 }
                             }
                         }
                         if (jj.contains("nozzle_target_temper")) {
                             if (jj["nozzle_target_temper"].is_number()) {
-                                if (m_nozzle_data.nozzles.size() == 1) {
-                                    m_nozzle_data.nozzles[0].target_temp = jj["nozzle_temper"].get<float>();
+                                if (m_extder_data.extders.size() == 1) {
+                                    m_extder_data.extders[0].target_temp = jj["nozzle_temper"].get<float>();
                                 }
                             }
                         }
@@ -3593,8 +3593,8 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
                                         nozzle_diameter = string_to_float(jj["nozzle_diameter"].get<std::string>());
                                     }
 
-                                    if (nozzle_diameter == 0.0f) {m_nozzle_data.nozzles[0].diameter = 0.4f;}
-                                    else {m_nozzle_data.nozzles[0].diameter = round(nozzle_diameter * 10) / 10;}
+                                    if (nozzle_diameter == 0.0f) {m_extder_data.extders[0].diameter = 0.4f;}
+                                    else {m_extder_data.extders[0].diameter = round(nozzle_diameter * 10) / 10;}
                                 }
                             }
                         }
@@ -3611,7 +3611,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
                                 else {
                                     if (jj["nozzle_type"].is_string()) {
                                         auto nozzle_type = jj["nozzle_type"].get<std::string>();
-                                        m_nozzle_data.nozzles[0].type = nozzle_type;
+                                        m_extder_data.extders[0].type = nozzle_type;
                                     }
                                 }
                             }
@@ -3898,7 +3898,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
                     }
                     PresetBundle *preset_bundle = Slic3r::GUI::wxGetApp().preset_bundle;
                     std::ostringstream stream;
-                    stream << std::fixed << std::setprecision(1) << DeviceManager::nozzle_diameter_conver(m_nozzle_data.nozzles[0].diameter);
+                    stream << std::fixed << std::setprecision(1) << DeviceManager::nozzle_diameter_conver(m_extder_data.extders[0].diameter);
                     std::string           nozzle_diameter_str = stream.str();
                     if (m_printer_preset_name.find(nozzle_diameter_str + " nozzle") == std::string::npos)
                         update_printer_preset_name(nozzle_diameter_str);
@@ -5520,15 +5520,15 @@ void MachineObject::parse_new_info(json print)
         if (device.contains("nozzle")) {
             json const& nozzle = device["nozzle"];
 
-            m_nozzle_data = NozzleData();
-            m_nozzle_data.current_nozzle_id = get_flag_bits(nozzle["info"].get<int>(), 0, 3);
-            m_nozzle_data.target_nozzle_id = get_flag_bits(nozzle["info"].get<int>(), 4, 3);
-            m_nozzle_data.total_nozzle_count = get_flag_bits(nozzle["info"].get<int>(), 8, 3);
+            m_extder_data = ExtderData();
+            m_extder_data.current_extder_id = get_flag_bits(nozzle["info"].get<int>(), 0, 3);
+            m_extder_data.target_extder_id = get_flag_bits(nozzle["info"].get<int>(), 4, 3);
+            m_extder_data.total_extder_count = get_flag_bits(nozzle["info"].get<int>(), 8, 3);
 
 
-            for (int i = 0; i < m_nozzle_data.total_nozzle_count; i++) {
+            for (int i = 0; i < m_extder_data.total_extder_count; i++) {
 
-                Nozzle nozzle_obj;
+                Extder nozzle_obj;
 
                 std::string nozzle_id = std::to_string(i);
                 if (nozzle.contains(nozzle_id)) {
@@ -5561,7 +5561,7 @@ void MachineObject::parse_new_info(json print)
                     nozzle_obj.rfid_stat = get_flag_bits(njon["stat"].get<int>(), 16, 7);
                 }
 
-                m_nozzle_data.nozzles.push_back(nozzle_obj);
+                m_extder_data.extders.push_back(nozzle_obj);
             }
         }
     }
diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp
index 4ee5e16c66..d431a66d32 100644
--- a/src/slic3r/GUI/DeviceManager.hpp
+++ b/src/slic3r/GUI/DeviceManager.hpp
@@ -142,7 +142,7 @@ struct AmsSlot
     std::string slot_id;
 };
 
-struct Nozzle
+struct Extder
 {
     std::string type;  //0-hardened_steel 1-stainless_steel
     float diameter = {0.4f}; // 0-0.2mm  1-0.4mm 2-0.6 mm3-0.8mm
@@ -160,12 +160,12 @@ struct Nozzle
     int rfid_stat{0}; ;
 };
 
-struct NozzleData
+struct ExtderData
 {
-    int current_nozzle_id{0};
-    int target_nozzle_id{0};
-    int total_nozzle_count {0};
-    std::vector<Nozzle> nozzles;
+    int current_extder_id{0};
+    int target_extder_id{0};
+    int total_extder_count {0};
+    std::vector<Extder> extders;
 };
 
 struct RatingInfo {
@@ -1019,7 +1019,7 @@ public:
 
     /*for more extruder*/
     bool                        is_enable_np{ false };
-    NozzleData                  m_nozzle_data;
+    ExtderData                  m_extder_data;
 
     /* Device Filament Check */
     std::set<std::string> m_checked_filament;
diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp
index e0c9d1026e..bcfa6c9910 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.cpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.cpp
@@ -553,8 +553,8 @@ void PrinterPartsDialog::set_nozzle_diameter(wxCommandEvent& evt)
             auto nozzle_diameter = std::stof(nozzle_diameter_checkbox->GetStringSelection().ToStdString());
             nozzle_diameter = round(nozzle_diameter * 10) / 10;
             
-            obj->m_nozzle_data.nozzles[0].diameter = nozzle_diameter;
-            obj->m_nozzle_data.nozzles[0].type = nozzle_type;
+            obj->m_extder_data.extders[0].diameter = nozzle_diameter;
+            obj->m_extder_data.extders[0].type = nozzle_type;
 
             obj->command_set_printer_nozzle(nozzle_type, nozzle_diameter);
         }
@@ -579,8 +579,8 @@ bool PrinterPartsDialog::Show(bool show)
         CentreOnParent();
 
 
-        auto type = obj->m_nozzle_data.nozzles[0].type;
-        auto diameter = obj->m_nozzle_data.nozzles[0].diameter;
+        auto type = obj->m_extder_data.extders[0].type;
+        auto diameter = obj->m_extder_data.extders[0].diameter;
 
         nozzle_type_checkbox->Clear();
         nozzle_diameter_checkbox->Clear();
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index ad408a00be..ebcf23cf0a 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -2456,14 +2456,14 @@ bool SelectMachineDialog::is_same_nozzle_diameters(std::string& tag_nozzle_type,
             preset_nozzle_type = "stainless_steel";
         }
 
-        tag_nozzle_type = obj_->m_nozzle_data.nozzles[0].type;
+        tag_nozzle_type = obj_->m_extder_data.extders[0].type;
 
         auto        extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders();
         if (opt_nozzle_diameters != nullptr) {
             for (auto i = 0; i < extruders.size(); i++) {
                 auto extruder = extruders[i] - 1;
                 preset_nozzle_diameters = float(opt_nozzle_diameters->get_at(extruder));
-                if (preset_nozzle_diameters != obj_->m_nozzle_data.nozzles[0].diameter) {
+                if (preset_nozzle_diameters != obj_->m_extder_data.extders[0].diameter) {
                     is_same_nozzle_diameters = false;
                 }
             }
@@ -2493,10 +2493,10 @@ bool SelectMachineDialog::is_same_nozzle_type(std::string& filament_type, std::s
 
     NozzleType nozzle_type = NozzleType::ntUndefine;
 
-    if (obj_->m_nozzle_data.nozzles[0].type == "stainless_steel") {
+    if (obj_->m_extder_data.extders[0].type == "stainless_steel") {
         nozzle_type = NozzleType::ntStainlessSteel;
     }
-    else if (obj_->m_nozzle_data.nozzles[0].type == "hardened_steel") {
+    else if (obj_->m_extder_data.extders[0].type == "hardened_steel") {
         nozzle_type = NozzleType::ntHardenedSteel;
     }
 
@@ -2517,7 +2517,7 @@ bool SelectMachineDialog::is_same_nozzle_type(std::string& filament_type, std::s
             return is_same_nozzle_type;
         }
         else {
-            tag_nozzle_type = DeviceManager::nozzle_type_conver(obj_->m_nozzle_data.nozzles[0].type);
+            tag_nozzle_type = DeviceManager::nozzle_type_conver(obj_->m_extder_data.extders[0].type);
         }
 
         iter++;
@@ -2710,13 +2710,13 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
     std::string filament_type;
     std::string tag_nozzle_type;
 
-    if (!obj_->m_nozzle_data.nozzles[0].type.empty() && (m_print_type == PrintFromType::FROM_NORMAL)) {
+    if (!obj_->m_extder_data.extders[0].type.empty() && (m_print_type == PrintFromType::FROM_NORMAL)) {
         if (!is_same_nozzle_diameters(tag_nozzle_type, nozzle_diameter)) {
             has_slice_warnings = true;
             // is_printing_block  = true;  # Removed to allow nozzle overrides (to support non-standard nozzles)
             
             wxString nozzle_in_preset = wxString::Format(_L("nozzle in preset: %s %s"),nozzle_diameter, "");
-            wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj_->m_nozzle_data.nozzles[0].diameter, "");
+            wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj_->m_extder_data.extders[0].diameter, "");
 
             confirm_text.push_back(ConfirmBeforeSendInfo(_L("Your nozzle diameter in sliced file is not consistent with memorized nozzle. If you changed your nozzle lately, please go to Device > Printer Parts to change settings.") 
                 + "\n    " + nozzle_in_preset 
@@ -2727,9 +2727,9 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
         if (!is_same_nozzle_type(filament_type, tag_nozzle_type)){
             has_slice_warnings = true;
             is_printing_block = true;
-            nozzle_diameter =  wxString::Format("%.1f", obj_->m_nozzle_data.nozzles[0].diameter).ToStdString();
+            nozzle_diameter =  wxString::Format("%.1f", obj_->m_extder_data.extders[0].diameter).ToStdString();
 
-                wxString nozzle_in_preset = wxString::Format(_L("Printing high temperature material(%s material) with %s may cause nozzle damage"), filament_type, format_steel_name(obj_->m_nozzle_data.nozzles[0].type));
+                wxString nozzle_in_preset = wxString::Format(_L("Printing high temperature material(%s material) with %s may cause nozzle damage"), filament_type, format_steel_name(obj_->m_extder_data.extders[0].type));
             confirm_text.push_back(ConfirmBeforeSendInfo(nozzle_in_preset, ConfirmBeforeSendInfo::InfoLevel::Warning));
         }
     }
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 076d9ca76d..ac99aad878 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -2378,7 +2378,7 @@ void StatusPanel::update_temp_ctrl(MachineObject *obj)
         m_tempCtrl_bed->SetIconNormal();
     }
 
-    m_tempCtrl_nozzle->SetCurrTemp((int) obj->m_nozzle_data.nozzles[0].temp);
+    m_tempCtrl_nozzle->SetCurrTemp((int) obj->m_extder_data.extders[0].temp);
     if (obj->nozzle_max_temperature > -1) {
         if (m_tempCtrl_nozzle) m_tempCtrl_nozzle->SetMaxTemp(obj->nozzle_max_temperature);
     }
@@ -2389,10 +2389,10 @@ void StatusPanel::update_temp_ctrl(MachineObject *obj)
     if (m_temp_nozzle_timeout > 0) {
         m_temp_nozzle_timeout--;
     } else {
-        if (!nozzle_temp_input) { m_tempCtrl_nozzle->SetTagTemp((int) obj->m_nozzle_data.nozzles[0].target_temp); }
+        if (!nozzle_temp_input) { m_tempCtrl_nozzle->SetTagTemp((int) obj->m_extder_data.extders[0].target_temp); }
     }
 
-    if ((obj->m_nozzle_data.nozzles[0].target_temp - obj->m_nozzle_data.nozzles[0].temp) >= TEMP_THRESHOLD_VAL) {
+    if ((obj->m_extder_data.extders[0].target_temp - obj->m_extder_data.extders[0].temp) >= TEMP_THRESHOLD_VAL) {
         m_tempCtrl_nozzle->SetIconActive();
     } else {
         m_tempCtrl_nozzle->SetIconNormal();
@@ -2587,7 +2587,7 @@ void StatusPanel::update_ams(MachineObject *obj)
     if (obj->cali_version != -1 && last_cali_version != obj->cali_version) {
         last_cali_version = obj->cali_version;
         PACalibExtruderInfo cali_info;
-        cali_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter;
+        cali_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
         CalibUtils::emit_get_PA_calib_info(cali_info);
     }
 
@@ -3410,7 +3410,7 @@ void StatusPanel::axis_ctrl_e_hint(bool up_down)
 void StatusPanel::on_axis_ctrl_e_up_10(wxCommandEvent &event)
 {
     if (obj) {
-        if (obj->m_nozzle_data.nozzles[0].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL || (wxGetApp().app_config->get("not_show_ectrl_hint") == "1"))
+        if (obj->m_extder_data.extders[0].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL || (wxGetApp().app_config->get("not_show_ectrl_hint") == "1"))
             obj->command_axis_control("E", 1.0, -10.0f, 900);
         else
             axis_ctrl_e_hint(true);
@@ -3420,7 +3420,7 @@ void StatusPanel::on_axis_ctrl_e_up_10(wxCommandEvent &event)
 void StatusPanel::on_axis_ctrl_e_down_10(wxCommandEvent &event)
 {
     if (obj) {
-        if (obj->m_nozzle_data.nozzles[0].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL || (wxGetApp().app_config->get("not_show_ectrl_hint") == "1"))
+        if (obj->m_extder_data.extders[0].temp >= TEMP_THRESHOLD_ALLOW_E_CTRL || (wxGetApp().app_config->get("not_show_ectrl_hint") == "1"))
             obj->command_axis_control("E", 1.0, 10.0f, 900);
         else
             axis_ctrl_e_hint(false);
diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp
index 830cf97477..db08f1566e 100644
--- a/src/slic3r/Utils/CalibUtils.cpp
+++ b/src/slic3r/Utils/CalibUtils.cpp
@@ -107,9 +107,9 @@ static bool is_same_nozzle_diameters(const DynamicPrintConfig &full_config, cons
         auto opt_nozzle_diameters = full_config.option<ConfigOptionFloats>("nozzle_diameter");
         if (opt_nozzle_diameters != nullptr) {
             float preset_nozzle_diameter = opt_nozzle_diameters->get_at(0);
-            if (preset_nozzle_diameter != obj->m_nozzle_data.nozzles[0].diameter) {
+            if (preset_nozzle_diameter != obj->m_extder_data.extders[0].diameter) {
                 wxString nozzle_in_preset  = wxString::Format(_L("nozzle in preset: %s %s"), wxString::Format("%.1f", preset_nozzle_diameter).ToStdString(), to_wstring_name(nozzle_type));
-                wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj->m_nozzle_data.nozzles[0].diameter, DeviceManager::nozzle_type_conver(obj->m_nozzle_data.nozzles[0].diameter));
+                wxString nozzle_in_printer = wxString::Format(_L("nozzle memorized: %.1f %s"), obj->m_extder_data.extders[0].diameter, DeviceManager::nozzle_type_conver(obj->m_extder_data.extders[0].diameter));
 
                 error_msg = _L("Your nozzle diameter in preset is not consistent with memorized nozzle diameter. Did you change your nozzle lately?") + "\n    " + nozzle_in_preset +
                             "\n    " + nozzle_in_printer + "\n";
@@ -129,9 +129,9 @@ static bool is_same_nozzle_type(const DynamicPrintConfig &full_config, const Mac
 
     NozzleType nozzle_type = NozzleType::ntUndefine;
 
-    if (obj->m_nozzle_data.nozzles[0].type == "stainless_steel") {
+    if (obj->m_extder_data.extders[0].type == "stainless_steel") {
         nozzle_type = NozzleType::ntStainlessSteel;
-    } else if (obj->m_nozzle_data.nozzles[0].type == "hardened_steel") {
+    } else if (obj->m_extder_data.extders[0].type == "hardened_steel") {
         nozzle_type = NozzleType::ntHardenedSteel;
     }
 
@@ -141,7 +141,7 @@ static bool is_same_nozzle_type(const DynamicPrintConfig &full_config, const Mac
         if (abs(filament_nozzle_hrc) > abs(printer_nozzle_hrc)) {
             BOOST_LOG_TRIVIAL(info) << "filaments hardness mismatch:  printer_nozzle_hrc = " << printer_nozzle_hrc << ", filament_nozzle_hrc = " << filament_nozzle_hrc;
             std::string filament_type = full_config.opt_string("filament_type", 0);
-            error_msg = wxString::Format(_L("*Printing %s material with %s may cause nozzle damage"), filament_type, to_wstring_name(obj->m_nozzle_data.nozzles[0].type));
+            error_msg = wxString::Format(_L("*Printing %s material with %s may cause nozzle damage"), filament_type, to_wstring_name(obj->m_extder_data.extders[0].type));
             error_msg += "\n";
 
             MessageDialog msg_dlg(nullptr, error_msg, wxEmptyString, wxICON_WARNING | wxOK | wxCANCEL);
@@ -174,7 +174,7 @@ static bool check_nozzle_diameter_and_type(const DynamicPrintConfig &full_config
     }
 
     // P1P/S
-    if (obj->m_nozzle_data.nozzles[0].type.empty())
+    if (obj->m_extder_data.extders[0].type.empty())
         return true;
 
     if (!is_same_nozzle_diameters(full_config, obj, error_msg))