diff --git a/source/WindowScreen_Menu.cpp b/source/WindowScreen_Menu.cpp
index 5726983..4c21014 100755
--- a/source/WindowScreen_Menu.cpp
+++ b/source/WindowScreen_Menu.cpp
@@ -915,18 +915,18 @@ void WindowScreen::setup_fileconfig_menu(bool is_save, bool reset_data, bool ski
 			this->possible_files.push_back(file_data);
 		}
 		file_data.index = STARTUP_FILE_INDEX;
-		file_data.name = load_layout_name(file_data.index, success, this->created_proper_folder);
+		file_data.name = load_layout_name(file_data.index, this->created_proper_folder, success);
 		this->possible_files.push_back(file_data);
 		for(int i = 1; i <= 4; i++) {
 			file_data.index = i;
-			file_data.name = load_layout_name(file_data.index, success, this->created_proper_folder);
+			file_data.name = load_layout_name(file_data.index, this->created_proper_folder, success);
 			this->possible_files.push_back(file_data);
 		}
 		int first_free;
 		bool failed = false;
 		for(first_free = 5; first_free <= 100; first_free++) {
 			file_data.index = first_free;
-			file_data.name = load_layout_name(file_data.index, success, this->created_proper_folder);
+			file_data.name = load_layout_name(file_data.index, this->created_proper_folder, success);
 			if(!success) {
 				failed = true;
 				break;
diff --git a/source/cc3dsfs.cpp b/source/cc3dsfs.cpp
index 053a411..7a1d94c 100755
--- a/source/cc3dsfs.cpp
+++ b/source/cc3dsfs.cpp
@@ -855,7 +855,7 @@ int main(int argc, char **argv) {
 		std::cout << "                   even if multiple are present." << std::endl;
 		std::cout << "  --failure_close  Automatically closes the software if the first connection" << std::endl;
 		std::cout << "                   doesn't succeed." << std::endl;
-		std::cout << "  --auto_close  Automatically closes the software on disconnect." << std::endl;
+		std::cout << "  --auto_close     Automatically closes the software on disconnect." << std::endl;
 		std::cout << "  --profile        Loads the profile with the specified ID at startup" << std::endl;
 		std::cout << "                   instead of the default one. When the program closes," << std::endl;
 		std::cout << "                   the data is also saved to the specified profile." << std::endl;
diff --git a/source/frontend.cpp b/source/frontend.cpp
index bd58ac6..a7b849b 100755
--- a/source/frontend.cpp
+++ b/source/frontend.cpp
@@ -208,7 +208,7 @@ const CropData top_gba_ds_pmd_rrt_crop = {
 .bot_x = 0, .bot_y = 0,
 .allowed_joint = true, .allowed_top = true, .allowed_bottom = false,
 .allowed_3ds = false, .allowed_ds = true, .is_game_specific = true,
-.name = "Top GBA"};
+.name = "Top PMD:RRT"};
 
 const CropData bottom_gba_ds_pmd_rrt_crop = {
 .top_width = 0, .top_height = 0,
@@ -217,7 +217,7 @@ const CropData bottom_gba_ds_pmd_rrt_crop = {
 .bot_x = (WIDTH_DS - WIDTH_GBA + 2) / 2, .bot_y = (HEIGHT_DS - HEIGHT_GBA) / 2,
 .allowed_joint = true, .allowed_top = false, .allowed_bottom = true,
 .allowed_3ds = false, .allowed_ds = true, .is_game_specific = true,
-.name = "Bottom GBA"};
+.name = "Bottom PMD:RRT"};
 
 static const CropData* basic_possible_crops[] = {
 &default_3ds_crop,