diff --git a/Main.py b/Main.py
index 4e0091c5..1d0f601d 100644
--- a/Main.py
+++ b/Main.py
@@ -187,10 +187,10 @@ def main(args, seed=None):
                     'S' if world.keyshuffle[player] else '', 'B' if world.bigkeyshuffle[player] else '')
 
                 playername = f"{f'_P{player}' if world.players > 1 else ''}{f'_{player_names[player]}' if player in player_names else ''}"
-                outfilesuffix = ('_%s_%s-%s-%s-%s%s_%s-%s%s%s%s%s' % (world.logic[player], world.difficulty[player], world.difficulty_adjustments[player],
+                outfilesuffix = ('_%s_%s-%s-%s-%s%s_%s-%s-%s%s%s%s%s' % (world.logic[player], world.difficulty[player], world.difficulty_adjustments[player],
                                                                           world.mode[player], world.goal[player],
                                                                           "" if world.timer in ['none', 'display'] else "-" + world.timer,
-                                                                          world.shuffle[player], world.algorithm, mcsb_name,
+                                                                          world.shuffle[player], world.doorShuffle[player], world.algorithm, mcsb_name,
                                                                           "-retro" if world.retro[player] else "",
                                                                           "-prog_" + world.progressive if world.progressive in ['off', 'random'] else "",
                                                                           "-nohints" if not world.hints[player] else "")) if not args.outputname else ''
diff --git a/Rom.py b/Rom.py
index c93b98ab..79462987 100644
--- a/Rom.py
+++ b/Rom.py
@@ -1258,7 +1258,6 @@ def patch_rom(world, player, rom, enemized):
     rom.name = bytearray('ER_{0}_{1:09}\0'.format(__version__[0:7], world.seed), 'utf8')
     assert len(rom.name) <= 21
     rom.write_bytes(0x7FC0, rom.name)
-    rom.name[0] = ord('D')
 
     # Write title screen Code
     hashint = int(rom.get_hash(), 16)