diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py
index a0ede5b17f..19150ff861 100644
--- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py
+++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py
@@ -1,8 +1,8 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2021 Ultimaker B.V.
 # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
 
-# Modifikation 06.09.2020
-# add checkbox, now you can choose and use configuration from Marlin Advanced Pause Feature!
+# Modification 06.09.2020
+# add checkbox, now you can choose and use configuration from the firmware itself.
 
 from typing import List
 from ..Script import Script
@@ -16,20 +16,12 @@ class FilamentChange(Script):
 
     def getSettingDataString(self):
         return """{
-            "name":"Filament Change",
+            "name": "Filament Change",
             "key": "FilamentChange",
             "metadata": {},
             "version": 2,
             "settings":
             {
-                "marlin": 
-                {
-                    "label": "Use Marlin Config?",
-                    "description": "Use configuration from Marlin Advanced Pause Feature!",
-                    "type": "bool",
-                    "default_value": true
-                },
-                
                 "layer_number":
                 {
                     "label": "Layer",
@@ -38,7 +30,13 @@ class FilamentChange(Script):
                     "type": "str",
                     "default_value": "1"
                 },
-
+                "firmware_config":
+                {
+                    "label": "Use Firmware Configuration",
+                    "description": "Use the settings in your firmware, or customise the parameters of the filament change here.",
+                    "type": "bool",
+                    "default_value": true
+                },
                 "initial_retract":
                 {
                     "label": "Initial Retraction",
@@ -46,8 +44,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 30.0,
-                    "enabled": "marlin == 0"
-                    
+                    "enabled": "not firmware_config"
                 },
                 "later_retract":
                 {
@@ -56,8 +53,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 300.0,
-                    "enabled": "marlin == 0"
-                    
+                    "enabled": "not firmware_config"
                 },
                 "x_position":
                 {
@@ -66,8 +62,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "enabled": "marlin == 0"
-                    
+                    "enabled": "not firmware_config"
                 },
                 "y_position":
                 {
@@ -76,8 +71,7 @@ class FilamentChange(Script):
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0,
-                    "enabled": "marlin == 0"
-                    
+                    "enabled": "not firmware_config"
                 }
             }
         }"""
@@ -93,11 +87,11 @@ class FilamentChange(Script):
         later_retract = self.getSettingValueByKey("later_retract")
         x_pos = self.getSettingValueByKey("x_position")
         y_pos = self.getSettingValueByKey("y_position")
-        marlin_conf = self.getSettingValueByKey("marlin")
+        firmware_config = self.getSettingValueByKey("firmware_config")
 
         color_change = "M600"
 
-        if marlin_conf: 
+        if firmware_config:
             color_change = color_change + " ; Generated by FilamentChange plugin\n"            
         else:
             if initial_retract is not None and initial_retract > 0.: