diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index f107121f34..637a4298eb 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -58,7 +58,7 @@ UM.MainWindow {
                     text: "Save Selection to File";
                     enabled: UM.Selection.hasSelection;
                     iconName: "document-save-as";
-                    onTriggered: devicesModel.requestWriteSelectionToDevice("local_file");
+                    onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file");
                 }
                 Menu {
                     id: saveAllMenu
@@ -70,8 +70,8 @@ UM.MainWindow {
                         model: UM.OutputDevicesModel { id: devicesModel; }
 
                         MenuItem {
-                            text: model.description
-                            onTriggered: devicesModel.requestWriteToDevice(model.id);
+                            text: model.description;
+                            onTriggered: UM.OutputDeviceManager.requestWriteToDevice(model.id);
                         }
                         onObjectAdded: saveAllMenu.insertItem(index, object)
                         onObjectRemoved: saveAllMenu.removeItem(object)
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index f5a34b5fc2..ec2066713f 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -107,13 +107,13 @@ Rectangle {
             anchors.topMargin: UM.Theme.sizes.save_button_text_margin.height;
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.sizes.default_margin.width;
-            tooltip: devicesModel.activeDevice.description;
+            tooltip: UM.OutputDeviceManager.activeDeviceDescription;
             enabled: progress > 0.99 && base.activity == true
 
             width: infoBox.width/6*4.5
             height: UM.Theme.sizes.save_button_save_to_button.height
 
-            text: devicesModel.activeDevice.short_description;
+            text: UM.OutputDeviceManager.activeDeviceShortDescription;
 
             style: ButtonStyle {
                 background: Rectangle {
@@ -128,7 +128,7 @@ Rectangle {
                 }
                 label: Item { }
             }
-            onClicked: devicesModel.requestWriteToDevice(devicesModel.activeDevice.id)
+            onClicked: UM.OutputDeviceManager.requestWriteToDevice(UM.OutputDeviceManager.activeDevice)
         }
 
         Button {
@@ -143,7 +143,7 @@ Rectangle {
             width: infoBox.width/6*1.3 - UM.Theme.sizes.save_button_text_margin.height;
             height: UM.Theme.sizes.save_button_save_to_button.height
 
-            iconSource: UM.Theme.icons[devicesModel.activeDevice.icon_name];
+            iconSource: UM.Theme.icons[UM.OutputDeviceManager.activeDeviceIconName];
 
             style: ButtonStyle {
                 background: Rectangle {
@@ -188,10 +188,10 @@ Rectangle {
                     MenuItem {
                         text: model.description
                         checkable: true;
-                        checked: model.id == devicesModel.activeDevice.id;
+                        checked: model.id == UM.OutputDeviceManager.activeDevice;
                         exclusiveGroup: devicesMenuGroup;
                         onTriggered: {
-                            devicesModel.setActiveDevice(model.id);
+                            UM.OutputDeviceManager.setActiveDevice(model.id);
                         }
                     }
                     onObjectAdded: devicesMenu.insertItem(index, object)