diff --git a/BaseClasses.py b/BaseClasses.py
index ba03cc46..16bbafe0 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -143,7 +143,7 @@ class World(object):
         logic = 0 if self.logic == 'noglitches' else 1
         mode = 0 if self.mode == 'open' else 1
         goal = 0 if self.goal == 'ganon' else 1 if self.goal == 'pedestal' else 2
-        shuffle = ['default', 'simple', 'restricted', 'full', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'].index(self.shuffle)
+        shuffle = ['vanilla', 'simple', 'restricted', 'full', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'].index(self.shuffle)
         dungeonitems = 0 if self.place_dungeon_items else 1
         return logic | (mode << 1) | (goal << 2) | (shuffle << 4) | (dungeonitems << 8)
 
diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index c0213b6f..7eac966e 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -8,7 +8,7 @@ def link_entrances(world):
         connect_simple(world, exitname, regionname)
 
     # if we do not shuffle, set default connections
-    if world.shuffle == 'default':
+    if world.shuffle == 'vanilla':
         for exitname, regionname in default_connections:
             connect_simple(world, exitname, regionname)
         for exitname, regionname in default_dungeon_connections:
diff --git a/Main.py b/Main.py
index a504b859..7f656802 100644
--- a/Main.py
+++ b/Main.py
@@ -385,8 +385,8 @@ if __name__ == '__main__':
     parser.add_argument('--difficulty', default='normal', const='normal', nargs='?', choices=['normal'], help='Select game difficulty. Affects available itempool.')
     parser.add_argument('--algorithm', default='regular', const='regular', nargs='?', choices=['regular', 'flood'],
                         help='Select item filling algorithm. Regular is the ordinary VT algorithm. Flood pushes out items starting from Link\'s House and is slightly biased to placing progression items with less restrictions.')
-    parser.add_argument('--shuffle', default='full', const='full', nargs='?', choices=['default', 'simple', 'restricted', 'full', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'],
-                        help='Select Entrance Shuffling Algorithm. Default is the Vanilla layout. \n'
+    parser.add_argument('--shuffle', default='full', const='full', nargs='?', choices=['vanilla', 'simple', 'restricted', 'full', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'],
+                        help='Select Entrance Shuffling Algorithm.\n'
                              'Simple shuffles Dungeon Entrances/Exits between each other and keeps all 4-entrance dungeons confined to one location. All caves outside of death mountain are shuffled in pairs.\n'
                              'Restricted uses Dungeons shuffling from Simple but freely connects remaining entrances.\n'
                              'Full mixes cave and dungeon entrances freely.\n'
diff --git a/Plando.py b/Plando.py
index 167f8a82..bb0b1bea 100644
--- a/Plando.py
+++ b/Plando.py
@@ -27,7 +27,7 @@ def main(args, seed=None):
     start = time.clock()
 
     # initialize the world
-    world = World('default', 'noglitches', 'standard', 'normal', 'ganon', False)
+    world = World('vanilla', 'noglitches', 'standard', 'normal', 'ganon', False)
     logger = logging.getLogger('')
 
     hasher = hashlib.md5()
diff --git a/Rom.py b/Rom.py
index 499e375b..b573b866 100644
--- a/Rom.py
+++ b/Rom.py
@@ -128,7 +128,7 @@ def patch_rom(world, rom, hashtable, quickswap=False, beep='normal', sprite=None
     write_byte(rom, 0xEFBD5, prizes.pop())
     write_byte(rom, 0xEFBD6, prizes.pop())
     # in open mode with shuffled caves, cannot guarantee access to rupees or a shop. Make 4 kill tree pull single bombs always to give guaranteed access
-    if world.shuffle not in ['default', 'dungeonsfull', 'dungeonssimple']:
+    if world.shuffle not in ['vanilla', 'dungeonsfull', 'dungeonssimple']:
         write_byte(rom, 0xEFBD6, 0xDC)
 
     # rupee crab prizes
@@ -203,12 +203,12 @@ def patch_rom(world, rom, hashtable, quickswap=False, beep='normal', sprite=None
 
     # disable open door sprites when exiting caves
     # this does not seem to work completely yet
-    if world.shuffle not in ['default', 'dungeonssimple', 'dungeonsfull']:
+    if world.shuffle not in ['vanilla', 'dungeonssimple', 'dungeonsfull']:
         for i in range(0x85):
             write_byte(rom, 0x15274 + i, 0x00)
 
     # fix trock doors for reverse entrances
-    if world.shuffle != 'default':
+    if world.shuffle != 'vanilla':
         write_byte(rom, 0xFED31, 0x0E)  # preopen bombable exit
         write_byte(rom, 0xFEE41, 0x0E)  # preopen bombable exit
         write_byte(rom, 0xFE465, 0x1E)  # remove small key door on backside of big key door