diff --git a/gci_extract.c b/gci_extract.c
index 138ee5b..d91fcd2 100644
--- a/gci_extract.c
+++ b/gci_extract.c
@@ -243,7 +243,7 @@ int main(int argc, char *argv[]) {
 	if (out_bin_filename)
 		strncpy(out_filename, out_bin_filename, FILENAME_MAX-1);
 	else
-		snprintf(out_filename, FILENAME_MAX-1, "q%03de%01d.bin", bin_header->quest_number_byte, bin_header->episode+1);
+		snprintf(out_filename, FILENAME_MAX-1, "q%05d.bin", bin_header->quest_number_byte);
 
 	printf("Writing compressed quest .bin data to %s ...\n", out_filename);
 	result = write_file(out_filename, bin_data, bin_data_size);
@@ -258,7 +258,7 @@ int main(int argc, char *argv[]) {
 	if (out_dat_filename)
 		strncpy(out_filename, out_dat_filename, FILENAME_MAX-1);
 	else
-		snprintf(out_filename, FILENAME_MAX-1, "q%03de%01d.dat", bin_header->quest_number_byte, bin_header->episode+1);
+		snprintf(out_filename, FILENAME_MAX-1, "q%05d.dat", bin_header->quest_number_byte);
 
 	printf("Writing compressed quest .dat data to %s ...\n", out_filename);
 	result = write_file(out_filename, dat_data, dat_data_size);