diff --git a/addons/save_load_system/autoloads/save_game_manager.gd b/addons/save_load_system/autoloads/save_game_manager.gd
index 2bb8e09..37602f1 100644
--- a/addons/save_load_system/autoloads/save_game_manager.gd
+++ b/addons/save_load_system/autoloads/save_game_manager.gd
@@ -57,9 +57,12 @@ func list_saves(include_quick_saves: bool = true, include_auto_saves: bool = tru
 
 	for filename: String in ResourceLoader.list_directory(save_game_data_path):
 		# TODO: Rework so the settings determine the file_name using prepends
-		if filename.begins_with("quicksave_") and not include_quick_saves: continue
-		elif filename.begins_with("autosave_") and not include_auto_saves: continue
-		elif !filename.begins_with("save_") and !filename.begins_with("quicksave_") and !filename.begins_with("autosave_"): continue
+		if filename.begins_with(_save_level_data_component.settings.quicksave_file_name_prepend) and not include_quick_saves:
+			continue
+		elif filename.begins_with(_save_level_data_component.settings.autosave_file_name_prepend) and not include_auto_saves:
+			continue
+		elif !filename.begins_with(_save_level_data_component.settings.save_file_name_prepend) and !filename.begins_with(_save_level_data_component.settings.quicksave_file_name_prepend) and !filename.begins_with(_save_level_data_component.settings.autosave_file_name_prepend):
+			continue
 
 		var _save_path: String = save_game_data_path + filename
 		var _save_icon: String = filename.replace(".tres", ".png")
@@ -206,19 +209,19 @@ func _on_load_game_save(resource_filename: String) -> void:
 
 func _on_quick_load() -> void:
 	if not _load_save_level_data_component(): return
-	_load_game_resource(_save_level_data_component.settings.quicksave_file_name)
+	_load_game_resource(_save_level_data_component.settings.quicksave_file_name_prepend + "game_data.tres")
 
 func _on_quick_save() -> void:
 	if not _load_save_level_data_component(): return
 
-	_save_game_as_resource("Quick Save", _save_level_data_component.settings.quicksave_file_name)
+	_save_game_as_resource("Quick Save", _save_level_data_component.settings.quicksave_file_name_prepend + "game_data.tres")
 
 ## Save the game, with a filename of `<save_prepend><current_date>.tres
 func _on_save_game_as_resource(save_name: String) -> void:
 	if not _load_save_level_data_component(): return
 
 	var current_date: String = Time.get_datetime_string_from_system().replace(":", "")
-	var _filename: String = "save_" + current_date + ".tres"
+	var _filename: String = _save_level_data_component.settings.save_file_name_prepend + current_date + ".tres"
 
 	_loaded_save_resource.save_name = save_name
 	_save_game_as_resource(save_name, _filename)
diff --git a/addons/save_load_system/resources/save_game_settings_resource.gd b/addons/save_load_system/resources/save_game_settings_resource.gd
index 4aca6b5..2621f37 100644
--- a/addons/save_load_system/resources/save_game_settings_resource.gd
+++ b/addons/save_load_system/resources/save_game_settings_resource.gd
@@ -10,6 +10,6 @@ extends Resource
 @export var save_game_data_path: String = "user://game_data/"
 @export var max_auto_saves: int = 5
 
-@export var save_file_name: String = "save_game_data.tres"
-@export var quicksave_file_name: String = "quicksave_game_data.tres"
-@export var autosave_file_name: String = "autosave_%s_game_data.tres" ## %s is the save number (probably 01)
+@export var save_file_name_prepend: String = "save_"
+@export var quicksave_file_name_prepend: String = "quicksave_"
+@export var autosave_file_name_prepend: String = "autosave_"