diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 6d6ff10a4b..6e0e0a6127 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -312,6 +312,15 @@ class MachineManagerModel(QObject):
         return ""
 
 
+    @pyqtSlot(str, str)
+    def renameQualityContainer(self, container_id, new_name):
+        containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = container_id, type = "quality")
+        if containers:
+            new_name = self._createUniqueName("machine", new_name, catalog.i18nc("@label", "Custom profile"))
+            containers[0].setName(new_name)
+            UM.Settings.ContainerRegistry.getInstance().containerChanged.emit(containers[0])
+
+
     @pyqtSlot(str)
     def removeQualityContainer(self, container_id):
         containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = container_id)
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 52ab10cfd6..c031ed9f20 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -184,19 +184,19 @@ UM.ManagementPage
 
         UM.ConfirmRemoveDialog
         {
-            id: confirmDialog;
-            object: base.currentItem != null ? base.currentItem.name : "";
-            onYes: Cura.MachineManager.removeQualityContainer(base.currentItem.id);
+            id: confirmDialog
+            object: base.currentItem != null ? base.currentItem.name : ""
+            onYes: Cura.MachineManager.removeQualityContainer(base.currentItem.id)
         }
         UM.RenameDialog
         {
             id: renameDialog;
-            object: base.currentItem != null ? base.currentItem.name : "";
-            property bool removeWhenRejected: false;
-            onAccepted: base.model.rename(base.currentItem.id, newName.trim());
+            object: base.currentItem != null ? base.currentItem.name : ""
+            property bool removeWhenRejected: false
+            onAccepted: Cura.MachineManager.renameQualityContainer(base.currentItem.id, newName)
             onRejected: {
                 if(removeWhenRejected) {
-                    base.model.removeProfile(base.currentItem.name)
+                    Cura.MachineManager.removeQualityContainer(base.currentItem.id)
                 }
             }
         }