diff --git a/resources/profiles/BBL/filament/Generic SBS @base.json b/resources/profiles/BBL/filament/Generic SBS @base.json
index dffe348812..32c6a1f9c1 100644
--- a/resources/profiles/BBL/filament/Generic SBS @base.json	
+++ b/resources/profiles/BBL/filament/Generic SBS @base.json	
@@ -3,7 +3,7 @@
     "name": "Generic SBS @base",
     "inherits": "fdm_filament_sbs",
     "from": "system",
-    "filament_id": "GFL99",
+    "filament_id": "GFLSBS99",
     "instantiation": "false",
     "filament_flow_ratio": [
         "0.98"
diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json
index e718a2aa59..982830b0ec 100644
--- a/resources/profiles/OrcaFilamentLibrary.json
+++ b/resources/profiles/OrcaFilamentLibrary.json
@@ -1,6 +1,6 @@
 {
     "name": "OrcaFilamentLibrary",
-    "version":  "02.03.00.03",
+    "version":  "02.03.00.04",
     "force_update": "0",
     "description": "Orca Filament Library",
     "filament_list": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json
index f5d8680b06..c50fefb856 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu ABS @base",
     "inherits": "fdm_filament_abs",
     "from": "system",
-    "filament_id": "GFB00",
+    "filament_id": "OGFB00",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json
index a67aa45465..b8d164ad0b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ABS-GF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu ABS-GF @base",
     "inherits": "fdm_filament_abs",
     "from": "system",
-    "filament_id": "GFB50",
+    "filament_id": "OGFB50",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json
index 322bb3514c..2fffc05539 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu ASA @base",
     "inherits": "fdm_filament_asa",
     "from": "system",
-    "filament_id": "GFB01",
+    "filament_id": "OGFB01",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "eng_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json
index 4cfe7de309..407c0960f2 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-Aero @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu ASA-Aero @base",
     "inherits": "fdm_filament_asa",
     "from": "system",
-    "filament_id": "GFB02",
+    "filament_id": "OGFB02",
     "instantiation": "false",
     "description": "This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: ASA Aero Printing Guide.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json
index d8c3c0ffce..1f369bd71e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu ASA-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu ASA-CF @base",
     "inherits": "fdm_filament_asa",
     "from": "system",
-    "filament_id": "GFB51",
+    "filament_id": "OGFB51",
     "instantiation": "false",
     "eng_plate_temp": [
         "100"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json
index f278ca567b..d24ba4bddb 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PA-CF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFN03",
+    "filament_id": "OGFN03",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json
index 7df1f06e4a..e48197c190 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PA6-CF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFN05",
+    "filament_id": "OGFN05",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json
index e2246b0cab..998709bb31 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PA6-GF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PA6-GF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFN08",
+    "filament_id": "OGFN08",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json
index 17ef39575f..7b9521d064 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PAHT-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PAHT-CF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFN04",
+    "filament_id": "OGFN04",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json
index 001f7c94d7..8523dfb27a 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PC @base",
     "inherits": "fdm_filament_pc",
     "from": "system",
-    "filament_id": "GFC00",
+    "filament_id": "OGFC00",
     "instantiation": "false",
     "filament_vendor": [
         "Bambu Lab"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json
index c01a0dfe0d..771f914e96 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PC FR @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PC FR @base",
     "inherits": "fdm_filament_pc",
     "from": "system",
-    "filament_id": "GFC01",
+    "filament_id": "OGFC01",
     "instantiation": "false",
     "filament_cost": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json
index 86f36ecab1..23334321d7 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PET-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PET-CF @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFT01",
+    "filament_id": "OGFT01",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json
index 07f806457b..e9703ccd64 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Basic @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PETG Basic @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFG00",
+    "filament_id": "OGFG00",
     "instantiation": "false",
     "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json
index dc50f6b886..40ddd215e2 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG HF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PETG HF @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFG02",
+    "filament_id": "OGFG02",
     "instantiation": "false",
     "cool_plate_temp": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json
index 1582cd8d4a..170b4897f6 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG Translucent @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PETG Translucent @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFG01",
+    "filament_id": "OGFG01",
     "instantiation": "false",
     "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json
index 89eccb7c52..37e45c1161 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PETG-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PETG-CF @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFG50",
+    "filament_id": "OGFG50",
     "instantiation": "false",
     "cool_plate_temp": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json
index a53ae18186..d5b7b0d2b6 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Aero @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Aero @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA11",
+    "filament_id": "OGFA11",
     "instantiation": "false",
     "description": "This filament is only used to print models with a low density usually, and some special parameters are required. To get better printing quality, please refer to this wiki: Instructions for printing RC model with foaming PLA (PLA Aero).",
     "fan_min_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json
index 5e584c7980..370575adec 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Basic @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Basic @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA00",
+    "filament_id": "OGFA00",
     "instantiation": "false",
     "filament_cost": [
         "24.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json
index 46b034593c..cee702812c 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Dynamic @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Dynamic @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA13",
+    "filament_id": "OGFA13",
     "instantiation": "false",
     "filament_cost": [
         "31.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json
index a493400c1a..6695eab188 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Galaxy @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Galaxy @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA15",
+    "filament_id": "OGFA15",
     "instantiation": "false",
     "filament_cost": [
         "29.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json
index 206578285f..4641fdb0a7 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Glow @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Glow @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA12",
+    "filament_id": "OGFA12",
     "instantiation": "false",
     "filament_cost": [
         "29.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json
index f56887abff..031ee90bcf 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Impact @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Impact @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA03",
+    "filament_id": "OGFA03",
     "instantiation": "false",
     "filament_cost": [
         "25.4"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json
index a34253171b..081b57b5af 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Marble @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Marble @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA07",
+    "filament_id": "OGFA07",
     "instantiation": "false",
     "filament_cost": [
         "29.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json
index 700253f841..d5afe93c8e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Matte @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Matte @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA01",
+    "filament_id": "OGFA01",
     "instantiation": "false",
     "filament_cost": [
         "24.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json
index d2edaf4bd3..fd5c853a8f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Metal @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Metal @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA02",
+    "filament_id": "OGFA02",
     "instantiation": "false",
     "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json
index 40b486e812..1883fb3d7f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Silk @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA05",
+    "filament_id": "OGFA05",
     "instantiation": "false",
     "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json
index 550061b0bc..89be4fef11 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Silk+ @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Silk+ @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA06",
+    "filament_id": "OGFA06",
     "instantiation": "false",
     "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json
index 02bddb8948..44807890e7 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Sparkle @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Sparkle @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA08",
+    "filament_id": "OGFA08",
     "instantiation": "false",
     "filament_cost": [
         "29.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json
index 489843c50b..750b8d9a63 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Tough @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Tough @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA09",
+    "filament_id": "OGFA09",
     "instantiation": "false",
     "filament_cost": [
         "28.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json
index 45015187b3..5ba1c5b39e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA Wood @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA Wood @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA16",
+    "filament_id": "OGFA16",
     "instantiation": "false",
     "filament_cost": [
         "24.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json
index b16b20ca1d..b3caa3d535 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PLA-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PLA-CF @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFA50",
+    "filament_id": "OGFA50",
     "instantiation": "false",
     "additional_cooling_fan_speed": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json
index d94bae666c..7a08929b2c 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPA-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PPA-CF @base",
     "inherits": "fdm_filament_ppa",
     "from": "system",
-    "filament_id": "GFN06",
+    "filament_id": "OGFN06",
     "instantiation": "false",
     "filament_vendor": [
         "Bambu Lab"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json
index cef49fe98d..08ef894d07 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PPS-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PPS-CF @base",
     "inherits": "fdm_filament_pps",
     "from": "system",
-    "filament_id": "GFT02",
+    "filament_id": "OGFT02",
     "instantiation": "false",
     "description": "When printing this filament, there's a risk of nozzle clogging, oozing, warping and low layer adhesion strength. To get better results, please refer to this wiki: Printing Tips for High Temp / Engineering materials.",
     "fan_max_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json
index f9396292cf..8d10a456e9 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu PVA @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu PVA @base",
     "inherits": "fdm_filament_pva",
     "from": "system",
-    "filament_id": "GFS04",
+    "filament_id": "OGFS04",
     "instantiation": "false",
     "description": "This is a water-soluble support filament, and usually it is only for the support structure and not for the model body. Printing this filament is of many requirements, and to get better printing quality, please refer to this wiki: PVA Printing Guide.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json
index 3166617d72..999167bfef 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PA PET @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu Support For PA/PET @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFS03",
+    "filament_id": "OGFS03",
     "instantiation": "false",
     "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json
index 4fda6e0010..38a7c2ee4f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu Support For PLA @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFS02",
+    "filament_id": "OGFS02",
     "instantiation": "false",
     "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json
index 6eae3684bf..3047f0c839 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support For PLA-PETG @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu Support For PLA/PETG @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFS05",
+    "filament_id": "OGFS05",
     "instantiation": "false",
     "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json
index 7a60603cae..1b71a3143a 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support G @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu Support G @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFS01",
+    "filament_id": "OGFS01",
     "instantiation": "false",
     "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.",
     "fan_cooling_layer_time": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json
index d94a54812e..e977bb4478 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support W @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu Support W @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFS00",
+    "filament_id": "OGFS00",
     "instantiation": "false",
     "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json
index 3bd74d4d96..b37fd9fda9 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu Support for ABS @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu Support for ABS @base",
     "inherits": "fdm_filament_abs",
     "from": "system",
-    "filament_id": "GFS06",
+    "filament_id": "OGFS06",
     "instantiation": "false",
     "description": "This is a non-water-soluble support filament, and usually it is only for the support structure and not for the model body. To get better printing quality, please refer to this wiki: Printing Tips for Support Filament and Support Function.",
     "fan_max_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json
index eb0555633a..58703ae3ac 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu TPU 95A @base",
     "inherits": "fdm_filament_tpu",
     "from": "system",
-    "filament_id": "GFU01",
+    "filament_id": "OGFU01",
     "instantiation": "false",
     "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json
index 6deab30b35..5920b96f3e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Bambu/Bambu TPU 95A HF @base.json	
@@ -3,7 +3,7 @@
     "name": "Bambu TPU 95A HF @base",
     "inherits": "fdm_filament_tpu",
     "from": "system",
-    "filament_id": "GFU00",
+    "filament_id": "OGFU00",
     "instantiation": "false",
     "description": "This filament is too soft and not compatible with the AMS. Printing it is of many requirements, and to get better printing quality, please refer to this wiki: TPU printing guide.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json
index 518f53a614..5cde090033 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic ABS @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFB99",
+    "filament_id": "OGFB99",
     "setting_id": "OGFSA04",
     "name": "Generic ABS @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json
index 95f34f416a..3b6fab7f40 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic ASA @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFB98",
+    "filament_id": "OGFB98",
     "setting_id": "OGFSA04",
     "name": "Generic ASA @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json
index 4e28b8d3f4..3152c574dc 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFN99",
+    "filament_id": "OGFN99",
     "setting_id": "OGFSA04",
     "name": "Generic PA @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json
index 2f91467a13..c977883759 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PA-CF @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFN98",
+    "filament_id": "OGFN98",
     "setting_id": "OGFSA04",
     "name": "Generic PA-CF @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json
index 1724ee008c..18ecf1b579 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PC @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFC99",
+    "filament_id": "OGFC99",
     "setting_id": "OGFSA04",
     "name": "Generic PC @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json
index 14fcba533c..9fa002b49e 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PETG @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFG99",
+    "filament_id": "OGFG99",
     "setting_id": "OGFSA04",
     "name": "Generic PETG @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json
index b5ff0b42a8..85a2cf1f18 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA High Speed @System.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "Generic PLA High Speed @System",
     "inherits": "fdm_filament_pla",
-    "filament_id": "GFL95",
+    "filament_id": "OGFL95",
     "from": "system",
     "setting_id": "OGFSL95_00",
     "instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json
index d6bb799618..e1d7a082a1 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PLA-CF @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFL98",
+    "filament_id": "OGFL98",
     "setting_id": "OGFSA04",
     "name": "Generic PLA-CF @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json
index 57ee34719d..5cadf8fb85 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PPA-GF @System.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "Generic PPA-GF @System",
     "inherits": "fdm_filament_ppa",
-    "filament_id": "GFN96",
+    "filament_id": "OGFN96",
     "from": "system",
     "setting_id": "OGFSN96_00",
     "instantiation": "true",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json
index 20b1c491ff..1b9fca7888 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic PVA @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFS99",
+    "filament_id": "OGFS99",
     "setting_id": "OGFSA04",
     "name": "Generic PVA @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json
index 137d30dca6..4cc69180e4 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Generic TPU @System.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFU99",
+    "filament_id": "OGFU99",
     "setting_id": "OGFSA04",
     "name": "Generic TPU @System",
     "from": "system",
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json
index 7e9e9a1c0b..430dfee5d9 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture Matte PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "Overture Matte PLA @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFL05",
+    "filament_id": "OGFL05",
     "instantiation": "false",
     "filament_cost": [
         "24.52"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json
index 18e711b03c..cf4539628b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/Overture PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "Overture PLA @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFL04",
+    "filament_id": "OGFL04",
     "instantiation": "false",
     "filament_cost": [
         "24.15"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json
index e2a5bf6475..38e51a47e1 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PA12-CF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFL52",
+    "filament_id": "OGFL52",
     "instantiation": "false",
     "eng_plate_temp": [
         "40"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json
index 9d59fba6a8..776ff079ae 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PA6-CF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFL50",
+    "filament_id": "OGFL50",
     "instantiation": "false",
     "eng_plate_temp": [
         "40"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json
index 9ab9237e7b..9ee8ba6c39 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PA6-GF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFL51",
+    "filament_id": "OGFL51",
     "instantiation": "false",
     "eng_plate_temp": [
         "40"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json
index f545b1e1fb..76353f3782 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PA612-CF @base",
     "inherits": "fdm_filament_pa",
     "from": "system",
-    "filament_id": "GFL53",
+    "filament_id": "OGFL53",
     "instantiation": "false",
     "fan_cooling_layer_time": [
         "5"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json
index 701883fca7..810c1597e8 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PET-CF @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFL54",
+    "filament_id": "OGFL54",
     "instantiation": "false",
     "cool_plate_temp": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json
index 03c777e73a..8ee4a41050 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-ESD @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PETG-ESD @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFL06",
+    "filament_id": "OGFL06",
     "instantiation": "false",
     "cool_plate_temp": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json
index e039bd5c93..60325d1527 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF @base.json	
@@ -3,7 +3,7 @@
     "name": "Fiberon PETG-rCF @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFL55",
+    "filament_id": "OGFL55",
     "instantiation": "false",
     "cool_plate_temp": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json
index 539a1d1fc2..0b4963d013 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ABS @base.json	
@@ -3,7 +3,7 @@
     "name": "PolyLite ABS @base",
     "inherits": "fdm_filament_abs",
     "from": "system",
-    "filament_id": "GFB60",
+    "filament_id": "OGFB60",
     "instantiation": "false",
     "filament_cost": [
         "26.9"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json
index d29a9a2aa5..f0e68a1d1a 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite ASA @base.json	
@@ -3,7 +3,7 @@
     "name": "PolyLite ASA @base",
     "inherits": "fdm_filament_asa",
     "from": "system",
-    "filament_id": "GFB61",
+    "filament_id": "OGFB61",
     "instantiation": "false",
     "eng_plate_temp": [
         "100"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json
index f0100311cb..54afeeac8b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PETG @base.json	
@@ -3,7 +3,7 @@
     "name": "PolyLite PETG @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFG60",
+    "filament_id": "OGFG60",
     "instantiation": "false",
     "cool_plate_temp": [
         "0"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json
index b779aeb6ef..0f1cc00ad2 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @System.json	
@@ -3,6 +3,7 @@
     "name": "PolyLite PLA @System",
     "inherits": "PolyLite PLA @base",
     "from": "system",
+    "filament_id": "OGFL00",
     "setting_id": "OGFSL19",
     "instantiation": "true",
     "filament_max_volumetric_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json
index 1e7f4d16b7..a0b8231290 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "PolyLite PLA @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFL00",
+    "filament_id": "OGFL00",
     "instantiation": "false",
     "filament_cost": [
         "25.4"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json
index b2b4efd5e7..31755e588f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra Dual PLA @System.json	
@@ -4,6 +4,7 @@
     "instantiation": "true",
     "name": "PolyTerra Dual PLA @System",
     "renamed_from": "PolyTerra Dual PLA",
+    "filament_id": "OGFL00-1",
     "setting_id": "O1258005940",
     "inherits": "PolyTerra PLA @base",
     "compatible_printers": []
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json
index 2deb2d9141..a9419b5137 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "PolyTerra PLA @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFL01",
+    "filament_id": "OGFL01",
     "instantiation": "false",
     "filament_cost": [
         "25.4"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json
index 5448265560..f0bc00f17b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Marble PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU PLA Marble @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFSNL06",
+    "filament_id": "OGFSNL06",
     "instantiation": "false",
     "filament_cost": [
         "31.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json
index 9d2724491a..338f042e79 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PETG @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU PETG @base",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "GFSNL08",
+    "filament_id": "OGFSNL08",
     "instantiation": "false",
     "description": "To get better transparent or translucent results with the corresponding filament, please refer to this wiki: Printing tips for transparent PETG.",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json
index a79b7b65c0..3fea00cc3b 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA Matte @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU PLA Matte @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFSNL02",
+    "filament_id": "OGFSNL02",
     "instantiation": "false",
     "filament_cost": [
         "25.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json
index eddb7e97f5..f5cf65085c 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ 2.0 @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU PLA+ 2.0 @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFSNL04",
+    "filament_id": "OGFSNL04",
     "instantiation": "false",
     "filament_cost": [
         "18.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json
index e7efac83be..add42edf21 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU PLA+ @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU PLA+ @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFSNL03",
+    "filament_id": "OGFSNL03",
     "instantiation": "false",
     "filament_cost": [
         "18.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json
index 5b8fd61e35..3f1b8b6348 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Silk PLA+ @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU Silk PLA+ @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFSNL05",
+    "filament_id": "OGFSNL05",
     "instantiation": "false",
     "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.",
     "filament_cost": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json
index 65af44e85b..611804eb13 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/SUNLU/SUNLU Wood PLA @base.json	
@@ -3,7 +3,7 @@
     "name": "SUNLU Wood PLA @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFSNL07",
+    "filament_id": "OGFSNL07",
     "instantiation": "false",
     "filament_cost": [
         "26.99"
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json
index 1e2a27596f..0172786d9a 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_bvoh.json
@@ -4,7 +4,7 @@
     "inherits": "fdm_filament_common",
     "from": "system",
     "instantiation": "false",
-    "filament_id": "GFS97",
+    "filament_id": "OGFS97",
     "additional_cooling_fan_speed": [
         "70"
     ],
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json
index 9e77bf4f93..4e904bea38 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_eva.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_eva",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFR99",
+    "filament_id": "OGFR99",
     "from": "system",
     "instantiation": "false",
     "filament_type": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json
index ce42a7aa9b..3acc15068f 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_hips.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_hips",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFS98",
+    "filament_id": "OGFS98",
     "from": "system",
     "instantiation": "false",
     "cool_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json
index 3c7c03a4a9..1e6f16b892 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pa.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pa",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFN99",
+    "filament_id": "OGFN99",
     "from": "system",
     "instantiation": "false",
     "activate_air_filtration": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json
index ba79aff70d..4640a0b685 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pc.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pc",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFC99",
+    "filament_id": "OGFC99",
     "from": "system",
     "instantiation": "false",
     "supertack_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json
index 21eb7ed51c..507432ba03 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pctg.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pctg",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFG97",
+    "filament_id": "OGFG97",
     "from": "system",
     "instantiation": "false",
     "eng_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json
index d15ac9a773..10081f5415 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pe.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pe",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFP99",
+    "filament_id": "OGFP99",
     "from": "system",
     "instantiation": "false",
     "additional_cooling_fan_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json
index f4a31b746b..1f68e23775 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pet.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pet",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFG99",
+    "filament_id": "OGFG99",
     "from": "system",
     "instantiation": "false",
     "eng_plate_temp": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json
index 35d3c9abe0..7a73836b5a 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pha.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pha",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFR98",
+    "filament_id": "OGFR98",
     "from": "system",
     "instantiation": "false",
     "additional_cooling_fan_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json
index 45e21a49f3..97dae7e454 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla.json
@@ -4,7 +4,7 @@
     "inherits": "fdm_filament_common",
     "from": "system",
     "instantiation": "false",
-    "filament_id": "GFL99",
+    "filament_id": "OGFL99",
     "additional_cooling_fan_speed": [
         "70"
     ],
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json
index 9e407dbf4a..8128724a95 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pla_silk.json
@@ -3,7 +3,7 @@
     "name": "fdm_filament_pla_silk",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFL96",
+    "filament_id": "OGFL96",
     "instantiation": "false",
     "description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.",
     "filament_flow_ratio": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json
index bd6701b87e..6e0fb67487 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_pp.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_pp",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFP97",
+    "filament_id": "OGFP97",
     "from": "system",
     "instantiation": "false",
     "additional_cooling_fan_speed": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json
index 19409eabf4..307147ec35 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_ppa.json
@@ -2,7 +2,7 @@
     "type": "filament",
     "name": "fdm_filament_ppa",
     "inherits": "fdm_filament_common",
-    "filament_id": "GFN97",
+    "filament_id": "OGFN97",
     "from": "system",
     "instantiation": "false",
     "activate_air_filtration": [
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json
index 69ce757d9d..02634084a0 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json
+++ b/resources/profiles/OrcaFilamentLibrary/filament/base/fdm_filament_sbs.json
@@ -4,7 +4,7 @@
     "inherits": "fdm_filament_common",
     "from": "system",
     "instantiation": "false",
-    "filament_id": "GFL99",
+    "filament_id": "OGFLSBS99",
     "fan_cooling_layer_time": [
         "100"
     ],
diff --git a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json
index ac6bcd04fc..7c70418cd5 100644
--- a/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json	
+++ b/resources/profiles/OrcaFilamentLibrary/filament/eSUN/eSUN PLA+ @base.json	
@@ -3,7 +3,7 @@
     "name": "eSUN PLA+ @base",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "GFL03",
+    "filament_id": "OGFL03",
     "instantiation": "false",
     "filament_cost": [
         "22.99"