diff --git a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
index 828308ad..7e853de7 100644
--- a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
+++ b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs
@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var mkb = Deserializers.AACS.DeserializeStream(data);
-                if (mkb == null)
+                var model = Deserializers.AACS.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new AACSMediaKeyBlock(mkb, data);
+                return new AACSMediaKeyBlock(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
index e1fdfb3d..f2d5a6aa 100644
--- a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
+++ b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs
@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var svm = Deserializers.BDPlus.DeserializeStream(data);
-                if (svm == null)
+                var model = Deserializers.BDPlus.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new BDPlusSVM(svm, data);
+                return new BDPlusSVM(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/BFPK.cs b/SabreTools.Serialization/Wrappers/BFPK.cs
index 058708f9..4d8c706b 100644
--- a/SabreTools.Serialization/Wrappers/BFPK.cs
+++ b/SabreTools.Serialization/Wrappers/BFPK.cs
@@ -72,11 +72,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var archive = Deserializers.BFPK.DeserializeStream(data);
-                if (archive == null)
+                var model = Deserializers.BFPK.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new BFPK(archive, data);
+                return new BFPK(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/BSP.cs b/SabreTools.Serialization/Wrappers/BSP.cs
index 7fd470f7..06ab426c 100644
--- a/SabreTools.Serialization/Wrappers/BSP.cs
+++ b/SabreTools.Serialization/Wrappers/BSP.cs
@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.BSP.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.BSP.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new BSP(file, data);
+                return new BSP(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/CFB.cs b/SabreTools.Serialization/Wrappers/CFB.cs
index 7f0d33b9..a14287df 100644
--- a/SabreTools.Serialization/Wrappers/CFB.cs
+++ b/SabreTools.Serialization/Wrappers/CFB.cs
@@ -118,11 +118,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var binary = Deserializers.CFB.DeserializeStream(data);
-                if (binary == null)
+                var model = Deserializers.CFB.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new CFB(binary, data);
+                return new CFB(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/CHD.cs b/SabreTools.Serialization/Wrappers/CHD.cs
index 8a7b2972..4450e2a4 100644
--- a/SabreTools.Serialization/Wrappers/CHD.cs
+++ b/SabreTools.Serialization/Wrappers/CHD.cs
@@ -107,11 +107,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var header = Deserializers.CHD.DeserializeStream(data);
-                if (header == null)
+                var model = Deserializers.CHD.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new CHD(header, data);
+                return new CHD(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/CIA.cs b/SabreTools.Serialization/Wrappers/CIA.cs
index 4cb6142f..ab396c45 100644
--- a/SabreTools.Serialization/Wrappers/CIA.cs
+++ b/SabreTools.Serialization/Wrappers/CIA.cs
@@ -62,11 +62,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var cia = Deserializers.CIA.DeserializeStream(data);
-                if (cia == null)
+                var model = Deserializers.CIA.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new CIA(cia, data);
+                return new CIA(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/GCF.cs b/SabreTools.Serialization/Wrappers/GCF.cs
index bbf2c536..11a7183d 100644
--- a/SabreTools.Serialization/Wrappers/GCF.cs
+++ b/SabreTools.Serialization/Wrappers/GCF.cs
@@ -213,11 +213,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.GCF.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.GCF.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new GCF(file, data);
+                return new GCF(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/IRD.cs b/SabreTools.Serialization/Wrappers/IRD.cs
index 6c939bce..2a791300 100644
--- a/SabreTools.Serialization/Wrappers/IRD.cs
+++ b/SabreTools.Serialization/Wrappers/IRD.cs
@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.IRD.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.IRD.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new IRD(file, data);
+                return new IRD(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.cs b/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.cs
index ae6ca68b..bb37f7b1 100644
--- a/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.cs
+++ b/SabreTools.Serialization/Wrappers/InstallShieldArchiveV3.cs
@@ -158,11 +158,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var archive = Deserializers.InstallShieldArchiveV3.DeserializeStream(data);
-                if (archive == null)
+                var model = Deserializers.InstallShieldArchiveV3.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new InstallShieldArchiveV3(archive, data);
+                return new InstallShieldArchiveV3(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
index fe427018..9eff743f 100644
--- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs
@@ -150,11 +150,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var cabinet = Deserializers.InstallShieldCabinet.DeserializeStream(data);
-                if (cabinet == null)
+                var model = Deserializers.InstallShieldCabinet.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new InstallShieldCabinet(cabinet, data);
+                return new InstallShieldCabinet(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/LZKWAJ.cs b/SabreTools.Serialization/Wrappers/LZKWAJ.cs
index 14242c83..bfb8a993 100644
--- a/SabreTools.Serialization/Wrappers/LZKWAJ.cs
+++ b/SabreTools.Serialization/Wrappers/LZKWAJ.cs
@@ -81,11 +81,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.LZKWAJ.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.LZKWAJ.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new LZKWAJ(file, data);
+                return new LZKWAJ(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/LZQBasic.cs b/SabreTools.Serialization/Wrappers/LZQBasic.cs
index d5660b85..580607a3 100644
--- a/SabreTools.Serialization/Wrappers/LZQBasic.cs
+++ b/SabreTools.Serialization/Wrappers/LZQBasic.cs
@@ -65,11 +65,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.LZQBasic.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.LZQBasic.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new LZQBasic(file, data);
+                return new LZQBasic(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/LZSZDD.cs b/SabreTools.Serialization/Wrappers/LZSZDD.cs
index 847920b2..c26c9348 100644
--- a/SabreTools.Serialization/Wrappers/LZSZDD.cs
+++ b/SabreTools.Serialization/Wrappers/LZSZDD.cs
@@ -72,11 +72,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.LZSZDD.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.LZSZDD.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new LZSZDD(file, data);
+                return new LZSZDD(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/LinearExecutable.cs b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
index 7a41ba1b..eaa896c9 100644
--- a/SabreTools.Serialization/Wrappers/LinearExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/LinearExecutable.cs
@@ -80,11 +80,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var executable = Deserializers.LinearExecutable.DeserializeStream(data);
-                if (executable == null)
+                var model = Deserializers.LinearExecutable.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new LinearExecutable(executable, data);
+                return new LinearExecutable(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/MSDOS.cs b/SabreTools.Serialization/Wrappers/MSDOS.cs
index 385c810f..55158201 100644
--- a/SabreTools.Serialization/Wrappers/MSDOS.cs
+++ b/SabreTools.Serialization/Wrappers/MSDOS.cs
@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var executable = Deserializers.MSDOS.DeserializeStream(data);
-                if (executable == null)
+                var model = Deserializers.MSDOS.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new MSDOS(executable, data);
+                return new MSDOS(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
index f44b8d59..6454463a 100644
--- a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
+++ b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs
@@ -103,11 +103,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var cabinet = Deserializers.MicrosoftCabinet.DeserializeStream(data);
-                if (cabinet == null)
+                var model = Deserializers.MicrosoftCabinet.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new MicrosoftCabinet(cabinet, data);
+                return new MicrosoftCabinet(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/MoPaQ.cs b/SabreTools.Serialization/Wrappers/MoPaQ.cs
index 93479368..4eb1492c 100644
--- a/SabreTools.Serialization/Wrappers/MoPaQ.cs
+++ b/SabreTools.Serialization/Wrappers/MoPaQ.cs
@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var archive = Deserializers.MoPaQ.DeserializeStream(data);
-                if (archive == null)
+                var model = Deserializers.MoPaQ.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new MoPaQ(archive, data);
+                return new MoPaQ(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/N3DS.cs b/SabreTools.Serialization/Wrappers/N3DS.cs
index a1c20449..4db96c26 100644
--- a/SabreTools.Serialization/Wrappers/N3DS.cs
+++ b/SabreTools.Serialization/Wrappers/N3DS.cs
@@ -256,11 +256,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var cart = Deserializers.N3DS.DeserializeStream(data);
-                if (cart == null)
+                var model = Deserializers.N3DS.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new N3DS(cart, data);
+                return new N3DS(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/NCF.cs b/SabreTools.Serialization/Wrappers/NCF.cs
index 294912a2..25c1a3e8 100644
--- a/SabreTools.Serialization/Wrappers/NCF.cs
+++ b/SabreTools.Serialization/Wrappers/NCF.cs
@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.NCF.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.NCF.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new NCF(file, data);
+                return new NCF(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.cs b/SabreTools.Serialization/Wrappers/NewExecutable.cs
index 7413922f..ac1dce9c 100644
--- a/SabreTools.Serialization/Wrappers/NewExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/NewExecutable.cs
@@ -368,11 +368,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var executable = Deserializers.NewExecutable.DeserializeStream(data);
-                if (executable == null)
+                var model = Deserializers.NewExecutable.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new NewExecutable(executable, data);
+                return new NewExecutable(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/Nitro.cs b/SabreTools.Serialization/Wrappers/Nitro.cs
index 2a8e6659..c466a0d9 100644
--- a/SabreTools.Serialization/Wrappers/Nitro.cs
+++ b/SabreTools.Serialization/Wrappers/Nitro.cs
@@ -84,11 +84,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var cart = Deserializers.Nitro.DeserializeStream(data);
-                if (cart == null)
+                var model = Deserializers.Nitro.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new Nitro(cart, data);
+                return new Nitro(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PAK.cs b/SabreTools.Serialization/Wrappers/PAK.cs
index 85de9674..e390ee3c 100644
--- a/SabreTools.Serialization/Wrappers/PAK.cs
+++ b/SabreTools.Serialization/Wrappers/PAK.cs
@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.PAK.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.PAK.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PAK(file, data);
+                return new PAK(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PFF.cs b/SabreTools.Serialization/Wrappers/PFF.cs
index 748bb504..1d8300e0 100644
--- a/SabreTools.Serialization/Wrappers/PFF.cs
+++ b/SabreTools.Serialization/Wrappers/PFF.cs
@@ -76,11 +76,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var archive = Deserializers.PFF.DeserializeStream(data);
-                if (archive == null)
+                var model = Deserializers.PFF.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PFF(archive, data);
+                return new PFF(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PIC.cs b/SabreTools.Serialization/Wrappers/PIC.cs
index cfb6e4a8..00e7a23c 100644
--- a/SabreTools.Serialization/Wrappers/PIC.cs
+++ b/SabreTools.Serialization/Wrappers/PIC.cs
@@ -70,11 +70,11 @@ namespace SabreTools.Serialization.Wrappers
             try
             {
 
-                var di = Deserializers.PIC.DeserializeStream(data);
-                if (di == null)
+                var model = Deserializers.PIC.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PIC(di, data);
+                return new PIC(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PKZIP.cs b/SabreTools.Serialization/Wrappers/PKZIP.cs
index c77e8fdf..64156755 100644
--- a/SabreTools.Serialization/Wrappers/PKZIP.cs
+++ b/SabreTools.Serialization/Wrappers/PKZIP.cs
@@ -62,11 +62,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var archive = Deserializers.PKZIP.DeserializeStream(data);
-                if (archive == null)
+                var model = Deserializers.PKZIP.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PKZIP(archive, data);
+                return new PKZIP(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
index 64cb1f42..f62239c8 100644
--- a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
+++ b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs
@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var audioFile = Deserializers.PlayJAudio.DeserializeStream(data);
-                if (audioFile == null)
+                var model = Deserializers.PlayJAudio.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PlayJAudioFile(audioFile, data);
+                return new PlayJAudioFile(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs b/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs
index 65a20056..1446fcd8 100644
--- a/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs
+++ b/SabreTools.Serialization/Wrappers/PlayJPlaylist.cs
@@ -61,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var playlist = Deserializers.PlayJPlaylist.DeserializeStream(data);
-                if (playlist == null)
+                var model = Deserializers.PlayJPlaylist.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PlayJPlaylist(playlist, data);
+                return new PlayJPlaylist(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
index 078bc235..f6fd43b6 100644
--- a/SabreTools.Serialization/Wrappers/PortableExecutable.cs
+++ b/SabreTools.Serialization/Wrappers/PortableExecutable.cs
@@ -832,11 +832,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var executable = Deserializers.PortableExecutable.DeserializeStream(data);
-                if (executable == null)
+                var model = Deserializers.PortableExecutable.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new PortableExecutable(executable, data);
+                return new PortableExecutable(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/Quantum.cs b/SabreTools.Serialization/Wrappers/Quantum.cs
index 35d53758..e3e0a80c 100644
--- a/SabreTools.Serialization/Wrappers/Quantum.cs
+++ b/SabreTools.Serialization/Wrappers/Quantum.cs
@@ -80,11 +80,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var archive = Deserializers.Quantum.DeserializeStream(data);
-                if (archive == null)
+                var model = Deserializers.Quantum.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new Quantum(archive, data);
+                return new Quantum(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/SGA.cs b/SabreTools.Serialization/Wrappers/SGA.cs
index d59ca0fd..cfa9e377 100644
--- a/SabreTools.Serialization/Wrappers/SGA.cs
+++ b/SabreTools.Serialization/Wrappers/SGA.cs
@@ -109,11 +109,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.SGA.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.SGA.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new SGA(file, data);
+                return new SGA(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/SecuROMDFA.cs b/SabreTools.Serialization/Wrappers/SecuROMDFA.cs
index 51ae5039..1f7485fc 100644
--- a/SabreTools.Serialization/Wrappers/SecuROMDFA.cs
+++ b/SabreTools.Serialization/Wrappers/SecuROMDFA.cs
@@ -62,11 +62,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.SecuROMDFA.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.SecuROMDFA.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new SecuROMDFA(file, data);
+                return new SecuROMDFA(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/VBSP.cs b/SabreTools.Serialization/Wrappers/VBSP.cs
index f9c07b1d..87ddf332 100644
--- a/SabreTools.Serialization/Wrappers/VBSP.cs
+++ b/SabreTools.Serialization/Wrappers/VBSP.cs
@@ -71,11 +71,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.VBSP.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.VBSP.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new VBSP(file, data);
+                return new VBSP(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/VPK.cs b/SabreTools.Serialization/Wrappers/VPK.cs
index 08249a74..b608bc5c 100644
--- a/SabreTools.Serialization/Wrappers/VPK.cs
+++ b/SabreTools.Serialization/Wrappers/VPK.cs
@@ -136,11 +136,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.VPK.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.VPK.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new VPK(file, data);
+                return new VPK(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/WAD3.cs b/SabreTools.Serialization/Wrappers/WAD3.cs
index b4923abe..3bb3c63e 100644
--- a/SabreTools.Serialization/Wrappers/WAD3.cs
+++ b/SabreTools.Serialization/Wrappers/WAD3.cs
@@ -70,11 +70,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.WAD3.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.WAD3.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new WAD3(file, data);
+                return new WAD3(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/WrapperType.cs b/SabreTools.Serialization/Wrappers/WrapperType.cs
index 0d50724e..31d154e7 100644
--- a/SabreTools.Serialization/Wrappers/WrapperType.cs
+++ b/SabreTools.Serialization/Wrappers/WrapperType.cs
@@ -234,6 +234,16 @@ namespace SabreTools.Serialization.Wrappers
         /// </summary>
         WAD,
 
+        /// <summary>
+        /// Wise Installer Overlay Header
+        /// </summary>
+        WiseOverlayHeader,
+
+        /// <summary>
+        /// Wise Installer Script File
+        /// </summary>
+        WiseScript,
+
         /// <summary>
         /// xz archive
         /// </summary>
diff --git a/SabreTools.Serialization/Wrappers/XMID.cs b/SabreTools.Serialization/Wrappers/XMID.cs
index 7131f2f0..8e4c9c3d 100644
--- a/SabreTools.Serialization/Wrappers/XMID.cs
+++ b/SabreTools.Serialization/Wrappers/XMID.cs
@@ -89,12 +89,12 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var xmid = Deserializers.XMID.DeserializeString(data);
-                if (xmid == null)
+                var model = Deserializers.XMID.DeserializeString(data);
+                if (model == null)
                     return null;
 
                 var ms = new MemoryStream(Encoding.ASCII.GetBytes(data));
-                return new XMID(xmid, ms);
+                return new XMID(model, ms);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/XZP.cs b/SabreTools.Serialization/Wrappers/XZP.cs
index 3210d67e..163202ae 100644
--- a/SabreTools.Serialization/Wrappers/XZP.cs
+++ b/SabreTools.Serialization/Wrappers/XZP.cs
@@ -73,11 +73,11 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var file = Deserializers.XZP.DeserializeStream(data);
-                if (file == null)
+                var model = Deserializers.XZP.DeserializeStream(data);
+                if (model == null)
                     return null;
 
-                return new XZP(file, data);
+                return new XZP(model, data);
             }
             catch
             {
diff --git a/SabreTools.Serialization/Wrappers/XeMID.cs b/SabreTools.Serialization/Wrappers/XeMID.cs
index 99c28eff..a5c02087 100644
--- a/SabreTools.Serialization/Wrappers/XeMID.cs
+++ b/SabreTools.Serialization/Wrappers/XeMID.cs
@@ -104,12 +104,12 @@ namespace SabreTools.Serialization.Wrappers
 
             try
             {
-                var xemid = Deserializers.XeMID.DeserializeString(data);
-                if (xemid == null)
+                var model = Deserializers.XeMID.DeserializeString(data);
+                if (model == null)
                     return null;
 
                 var ms = new MemoryStream(Encoding.ASCII.GetBytes(data));
-                return new XeMID(xemid, ms);
+                return new XeMID(model, ms);
             }
             catch
             {