diff --git a/resources/profiles/Folgertech.json b/resources/profiles/Folgertech.json
index fff7efba16..055508d8a1 100644
--- a/resources/profiles/Folgertech.json
+++ b/resources/profiles/Folgertech.json
@@ -118,51 +118,51 @@
         },
         {
             "name": "Folgertech Generic ABS",
-            "sub_path": "filament/Generic ABS.json"
+            "sub_path": "filament/Folgertech Generic ABS.json"
         },
         {
             "name": "Folgertech Generic ASA",
-            "sub_path": "filament/Generic ASA.json"
+            "sub_path": "filament/Folgertech Generic ASA.json"
         },
 		{
             "name": "Folgertech Generic PA",
-            "sub_path": "filament/Generic PA.json"
+            "sub_path": "filament/Folgertech Generic PA.json"
         },
 		        {
             "name": "Folgertech Generic PA-CF",
-            "sub_path": "filament/Generic PA-CF.json"
+            "sub_path": "filament/Folgertech Generic PA-CF.json"
         },
         {
             "name": "Folgertech Generic PC",
-            "sub_path": "filament/Generic PC.json"
+            "sub_path": "filament/Folgertech Generic PC.json"
         },
 		{
             "name": "Folgertech Generic PETG",
-            "sub_path": "filament/Generic PETG.json"
+            "sub_path": "filament/Folgertech Generic PETG.json"
         },
 		{
             "name": "Folgertech Generic PETG-CF",
-            "sub_path": "filament/Generic PETG-CF.json"
+            "sub_path": "filament/Folgertech Generic PETG-CF.json"
         },
         {
             "name": "Folgertech Generic PLA",
-            "sub_path": "filament/Generic PLA.json"
+            "sub_path": "filament/Folgertech Generic PLA.json"
         },
         {
             "name": "Folgertech Generic PLA Silk",
-            "sub_path": "filament/Generic PLA Silk.json"
+            "sub_path": "filament/Folgertech Generic PLA Silk.json"
         },
         {
             "name": "Folgertech Generic PLA-CF",
-            "sub_path": "filament/Generic PLA-CF.json"
+            "sub_path": "filament/Folgertech Generic PLA-CF.json"
         },
         {
             "name": "Folgertech Generic TPU",
-            "sub_path": "filament/Generic TPU.json"
+            "sub_path": "filament/Folgertech Generic TPU.json"
         },
         {
             "name": "Folgertech Generic PVA",
-            "sub_path": "filament/Generic PVA.json"
+            "sub_path": "filament/Folgertech Generic PVA.json"
         }
     ],
     "machine_list": [
diff --git a/resources/profiles/Folgertech/Folgertech FT-5_cover.png b/resources/profiles/Folgertech/Folgertech FT-5_cover.png
index 573871fab5..89f96ddc0c 100644
Binary files a/resources/profiles/Folgertech/Folgertech FT-5_cover.png and b/resources/profiles/Folgertech/Folgertech FT-5_cover.png differ
diff --git a/resources/profiles/Folgertech/Folgertech FT-6_cover.png b/resources/profiles/Folgertech/Folgertech FT-6_cover.png
index 21fef32a03..6acaec98f4 100644
Binary files a/resources/profiles/Folgertech/Folgertech FT-6_cover.png and b/resources/profiles/Folgertech/Folgertech FT-6_cover.png differ
diff --git a/resources/profiles/Folgertech/Folgertech i3_cover.png b/resources/profiles/Folgertech/Folgertech i3_cover.png
index 504cad10bf..7f26f76536 100644
Binary files a/resources/profiles/Folgertech/Folgertech i3_cover.png and b/resources/profiles/Folgertech/Folgertech i3_cover.png differ
diff --git a/resources/profiles/Folgertech/filament/Generic ABS.json b/resources/profiles/Folgertech/filament/Folgertech Generic ABS.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic ABS.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic ABS.json
diff --git a/resources/profiles/Folgertech/filament/Generic ASA.json b/resources/profiles/Folgertech/filament/Folgertech Generic ASA.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic ASA.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic ASA.json
diff --git a/resources/profiles/Folgertech/filament/Generic PA-CF.json b/resources/profiles/Folgertech/filament/Folgertech Generic PA-CF.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PA-CF.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PA-CF.json
diff --git a/resources/profiles/Folgertech/filament/Generic PA.json b/resources/profiles/Folgertech/filament/Folgertech Generic PA.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PA.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PA.json
diff --git a/resources/profiles/Folgertech/filament/Generic PC.json b/resources/profiles/Folgertech/filament/Folgertech Generic PC.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PC.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PC.json
diff --git a/resources/profiles/Folgertech/filament/Generic PETG-CF.json b/resources/profiles/Folgertech/filament/Folgertech Generic PETG-CF.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PETG-CF.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PETG-CF.json
diff --git a/resources/profiles/Folgertech/filament/Generic PETG.json b/resources/profiles/Folgertech/filament/Folgertech Generic PETG.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PETG.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PETG.json
diff --git a/resources/profiles/Folgertech/filament/Generic PLA Silk.json b/resources/profiles/Folgertech/filament/Folgertech Generic PLA Silk.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PLA Silk.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PLA Silk.json
diff --git a/resources/profiles/Folgertech/filament/Generic PLA-CF.json b/resources/profiles/Folgertech/filament/Folgertech Generic PLA-CF.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PLA-CF.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PLA-CF.json
diff --git a/resources/profiles/Folgertech/filament/Generic PLA.json b/resources/profiles/Folgertech/filament/Folgertech Generic PLA.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PLA.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PLA.json
diff --git a/resources/profiles/Folgertech/filament/Generic PVA.json b/resources/profiles/Folgertech/filament/Folgertech Generic PVA.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic PVA.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic PVA.json
diff --git a/resources/profiles/Folgertech/filament/Generic TPU.json b/resources/profiles/Folgertech/filament/Folgertech Generic TPU.json
similarity index 100%
rename from resources/profiles/Folgertech/filament/Generic TPU.json
rename to resources/profiles/Folgertech/filament/Folgertech Generic TPU.json