diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 733def1b81..52a8498f5e 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -813,7 +813,7 @@ UM.MainWindow
                 base.visible = true;
                 restart();
             }
-            else if(UM.MachineManager.activeMachineInstance == "")
+            else if(Cura.MachineManager.activeMachineName == "")
             {
                 addMachineDialog.firstRun = true;
                 addMachineDialog.open();
diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml
index fac4fd841d..60e2c6698e 100644
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@@ -7,15 +7,16 @@ import QtQuick.Controls.Styles 1.1
 import QtQuick.Layouts 1.1
 
 import UM 1.1 as UM
+import Cura 1.0 as Cura
 
 Rectangle {
     id: base;
 
     property bool activity: Printer.getPlatformActivity;
     property string fileBaseName
-    property variant activeMachineInstance: UM.MachineManager.activeMachineInstance
+    property variant activeMachineName: Cura.MachineManager.activeMachineName
 
-    onActiveMachineInstanceChanged:
+    onActiveMachineNameChanged:
     {
         base.createFileName()
     }
@@ -28,27 +29,34 @@ Rectangle {
     height: childrenRect.height
     color: "transparent"
 
-    function createFileName(){
-        var splitMachineName = UM.MachineManager.activeMachineInstance.split(" ")
-        var abbrMachine = ''
-            for (var i = 0; i < splitMachineName.length; i++){
-                if (splitMachineName[i].search(/ultimaker/i) != -1){
-                    abbrMachine += 'UM'
-                }
-                else{
-                    if (splitMachineName[i].charAt(0).search(/[0-9]/g) == -1)
-                        abbrMachine += splitMachineName[i].charAt(0)
-                }
-                var regExpAdditives = /[0-9\+]/g;
-                var resultAdditives = splitMachineName[i].match(regExpAdditives);
-                if (resultAdditives != null){
-                    for (var j = 0; j < resultAdditives.length; j++){
-                        abbrMachine += resultAdditives[j]
-
-                    }
+    function createFileName()
+    {
+        var splitMachineName = Cura.MachineManager.activeMachineName.split(" ");
+        var abbrMachine = '';
+        for (var i = 0; i < splitMachineName.length; i++)
+        {
+            if (splitMachineName[i].search(/ultimaker/i) != -1)
+            {
+                abbrMachine += 'UM';
+            }
+            else
+            {
+                if (splitMachineName[i].charAt(0).search(/[0-9]/g) == -1)
+                {
+                    abbrMachine += splitMachineName[i].charAt(0);
                 }
             }
-        printJobTextfield.text = abbrMachine + '_' + base.fileBaseName
+            var regExpAdditives = /[0-9\+]/g;
+            var resultAdditives = splitMachineName[i].match(regExpAdditives);
+            if (resultAdditives != null)
+            {
+                for (var j = 0; j < resultAdditives.length; j++)
+                {
+                    abbrMachine += resultAdditives[j];
+                }
+            }
+        }
+        printJobTextfield.text = abbrMachine + '_' + base.fileBaseName;
     }
 
      Connections {