diff --git a/.gitmodules b/.gitmodules
index 2be6a574..dd590bb8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "dot10"]
-	path = dot10
-	url = e:/work/dot10.git
+[submodule "dnlib"]
+	path = dnlib
+	url = e:/work/dnlib.git
diff --git a/AssemblyData/AssemblyData.csproj b/AssemblyData/AssemblyData.csproj
index 61d56a35..847bed52 100644
--- a/AssemblyData/AssemblyData.csproj
+++ b/AssemblyData/AssemblyData.csproj
@@ -74,9 +74,9 @@
       <Project>{5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}</Project>
       <Name>de4dot.mdecrypt</Name>
     </ProjectReference>
-    <ProjectReference Include="..\dot10\src\dot10.csproj">
+    <ProjectReference Include="..\dnlib\src\dnlib.csproj">
       <Project>{FDFC1237-143F-4919-8318-4926901F4639}</Project>
-      <Name>dot10</Name>
+      <Name>dnlib</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/AssemblyData/AssemblyService.cs b/AssemblyData/AssemblyService.cs
index 421a0331..bf333972 100644
--- a/AssemblyData/AssemblyService.cs
+++ b/AssemblyData/AssemblyService.cs
@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.mdecrypt;
 
diff --git a/AssemblyData/IAssemblyService.cs b/AssemblyData/IAssemblyService.cs
index 41d01fc6..9a508d8d 100644
--- a/AssemblyData/IAssemblyService.cs
+++ b/AssemblyData/IAssemblyService.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.mdecrypt;
 
diff --git a/AssemblyData/methodsrewriter/AssemblyResolver.cs b/AssemblyData/methodsrewriter/AssemblyResolver.cs
index 5295995b..11ae7841 100644
--- a/AssemblyData/methodsrewriter/AssemblyResolver.cs
+++ b/AssemblyData/methodsrewriter/AssemblyResolver.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/AssemblyData/methodsrewriter/CodeGenerator.cs b/AssemblyData/methodsrewriter/CodeGenerator.cs
index c5677b7e..9658cedf 100644
--- a/AssemblyData/methodsrewriter/CodeGenerator.cs
+++ b/AssemblyData/methodsrewriter/CodeGenerator.cs
@@ -22,19 +22,19 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Emit;
-using dot10.DotNet.Emit;
-using dot10.DotNet;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet;
 using de4dot.blocks;
 
-using OpCode = dot10.DotNet.Emit.OpCode;
-using OpCodes = dot10.DotNet.Emit.OpCodes;
-using OperandType = dot10.DotNet.Emit.OperandType;
+using OpCode = dnlib.DotNet.Emit.OpCode;
+using OpCodes = dnlib.DotNet.Emit.OpCodes;
+using OperandType = dnlib.DotNet.Emit.OperandType;
 using ROpCode = System.Reflection.Emit.OpCode;
 using ROpCodes = System.Reflection.Emit.OpCodes;
 
 namespace AssemblyData.methodsrewriter {
 	class CodeGenerator {
-		static Dictionary<OpCode, ROpCode> dot10ToReflection = new Dictionary<OpCode, ROpCode>();
+		static Dictionary<OpCode, ROpCode> dnlibToReflection = new Dictionary<OpCode, ROpCode>();
 		static CodeGenerator() {
 			var refDict = new Dictionary<short, ROpCode>(0x100);
 			foreach (var f in typeof(ROpCodes).GetFields(BindingFlags.Static | BindingFlags.Public)) {
@@ -51,7 +51,7 @@ namespace AssemblyData.methodsrewriter {
 				ROpCode ropcode;
 				if (!refDict.TryGetValue(opcode.Value, out ropcode))
 					continue;
-				dot10ToReflection[opcode] = ropcode;
+				dnlibToReflection[opcode] = ropcode;
 			}
 		}
 
@@ -332,7 +332,7 @@ namespace AssemblyData.methodsrewriter {
 
 		ROpCode convertOpCode(OpCode opcode) {
 			ROpCode ropcode;
-			if (dot10ToReflection.TryGetValue(opcode, out ropcode))
+			if (dnlibToReflection.TryGetValue(opcode, out ropcode))
 				return ropcode;
 			return ROpCodes.Nop;
 		}
diff --git a/AssemblyData/methodsrewriter/MField.cs b/AssemblyData/methodsrewriter/MField.cs
index 75cf53ba..bdf75ccb 100644
--- a/AssemblyData/methodsrewriter/MField.cs
+++ b/AssemblyData/methodsrewriter/MField.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace AssemblyData.methodsrewriter {
 	class MField {
diff --git a/AssemblyData/methodsrewriter/MMethod.cs b/AssemblyData/methodsrewriter/MMethod.cs
index 99cee089..d37a8d2f 100644
--- a/AssemblyData/methodsrewriter/MMethod.cs
+++ b/AssemblyData/methodsrewriter/MMethod.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace AssemblyData.methodsrewriter {
 	class MMethod {
diff --git a/AssemblyData/methodsrewriter/MModule.cs b/AssemblyData/methodsrewriter/MModule.cs
index b85046b0..2c722743 100644
--- a/AssemblyData/methodsrewriter/MModule.cs
+++ b/AssemblyData/methodsrewriter/MModule.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/AssemblyData/methodsrewriter/MType.cs b/AssemblyData/methodsrewriter/MType.cs
index 22a32b37..273ec4c9 100644
--- a/AssemblyData/methodsrewriter/MType.cs
+++ b/AssemblyData/methodsrewriter/MType.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/AssemblyData/methodsrewriter/MethodsRewriter.cs b/AssemblyData/methodsrewriter/MethodsRewriter.cs
index ea82c3a6..d5661ee2 100644
--- a/AssemblyData/methodsrewriter/MethodsRewriter.cs
+++ b/AssemblyData/methodsrewriter/MethodsRewriter.cs
@@ -22,12 +22,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Emit;
-using dot10.DotNet.Emit;
-using dot10.DotNet;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet;
 using de4dot.blocks;
 
-using OpCode = dot10.DotNet.Emit.OpCode;
-using OpCodes = dot10.DotNet.Emit.OpCodes;
+using OpCode = dnlib.DotNet.Emit.OpCode;
+using OpCodes = dnlib.DotNet.Emit.OpCodes;
 using ROpCode = System.Reflection.Emit.OpCode;
 using ROpCodes = System.Reflection.Emit.OpCodes;
 
diff --git a/AssemblyData/methodsrewriter/Resolver.cs b/AssemblyData/methodsrewriter/Resolver.cs
index 6c6133f0..6e2adeac 100644
--- a/AssemblyData/methodsrewriter/Resolver.cs
+++ b/AssemblyData/methodsrewriter/Resolver.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/AssemblyData/methodsrewriter/ResolverUtils.cs b/AssemblyData/methodsrewriter/ResolverUtils.cs
index e820191b..20cdca0c 100644
--- a/AssemblyData/methodsrewriter/ResolverUtils.cs
+++ b/AssemblyData/methodsrewriter/ResolverUtils.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/AssemblyData/methodsrewriter/TypeInstanceResolver.cs b/AssemblyData/methodsrewriter/TypeInstanceResolver.cs
index bab13707..b717928a 100644
--- a/AssemblyData/methodsrewriter/TypeInstanceResolver.cs
+++ b/AssemblyData/methodsrewriter/TypeInstanceResolver.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/AssemblyData/methodsrewriter/TypeResolver.cs b/AssemblyData/methodsrewriter/TypeResolver.cs
index 59e23597..71e7b80a 100644
--- a/AssemblyData/methodsrewriter/TypeResolver.cs
+++ b/AssemblyData/methodsrewriter/TypeResolver.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace AssemblyData.methodsrewriter {
diff --git a/LICENSE.dot10.txt b/LICENSE.dnlib.txt
similarity index 95%
rename from LICENSE.dot10.txt
rename to LICENSE.dnlib.txt
index 98bccf3e..86c22ab7 100644
--- a/LICENSE.dot10.txt
+++ b/LICENSE.dnlib.txt
@@ -21,4 +21,4 @@
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </LICENSE>
 
-Official site: https://bitbucket.org/0xd4d/dot10
+Official site: https://bitbucket.org/0xd4d/dnlib
diff --git a/blocks/Block.cs b/blocks/Block.cs
index afd5cb86..de7a9626 100644
--- a/blocks/Block.cs
+++ b/blocks/Block.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	public class Block : BaseBlock {
diff --git a/blocks/Blocks.cs b/blocks/Blocks.cs
index bb228065..0ff25db9 100644
--- a/blocks/Blocks.cs
+++ b/blocks/Blocks.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	public class Blocks {
diff --git a/blocks/CodeGenerator.cs b/blocks/CodeGenerator.cs
index e9f74f7f..94e39a15 100644
--- a/blocks/CodeGenerator.cs
+++ b/blocks/CodeGenerator.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	class CodeGenerator {
diff --git a/blocks/DotNetUtils.cs b/blocks/DotNetUtils.cs
index 105f9707..ea72b1f7 100644
--- a/blocks/DotNetUtils.cs
+++ b/blocks/DotNetUtils.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	public enum FrameworkType {
diff --git a/blocks/DumpedMethods.cs b/blocks/DumpedMethods.cs
index 322bc979..6d89662f 100644
--- a/blocks/DumpedMethods.cs
+++ b/blocks/DumpedMethods.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet.MD;
-using dot10.DotNet;
+using dnlib.DotNet.MD;
+using dnlib.DotNet;
 
 namespace de4dot.blocks {
 	[Serializable]
diff --git a/blocks/ForwardScanOrder.cs b/blocks/ForwardScanOrder.cs
index 5f3150f1..237e139b 100644
--- a/blocks/ForwardScanOrder.cs
+++ b/blocks/ForwardScanOrder.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 namespace de4dot.blocks {
 	// This class makes sure that each block that is entered with a non-empty stack has at
 	// least one of its source blocks sorted before itself. This is to make sure peverify
-	// doesn't complain AND also to make sure dot10 sets the correct maxstack.
+	// doesn't complain AND also to make sure dnlib sets the correct maxstack.
 	class ForwardScanOrder {
 		ScopeBlock scopeBlock;
 		IList<BaseBlock> sorted;
diff --git a/blocks/GenericArgsSubstitutor.cs b/blocks/GenericArgsSubstitutor.cs
index 8dd7fe50..0d73ea03 100644
--- a/blocks/GenericArgsSubstitutor.cs
+++ b/blocks/GenericArgsSubstitutor.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.blocks {
 	public struct GenericArgsSubstitutor {
diff --git a/blocks/Instr.cs b/blocks/Instr.cs
index 9afb9c27..1b9df093 100644
--- a/blocks/Instr.cs
+++ b/blocks/Instr.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	public class Instr {
diff --git a/blocks/InstructionListParser.cs b/blocks/InstructionListParser.cs
index 82de56e3..20bc6d57 100644
--- a/blocks/InstructionListParser.cs
+++ b/blocks/InstructionListParser.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	class InstructionListParser {
diff --git a/blocks/MemberDefDict.cs b/blocks/MemberDefDict.cs
index 156b3beb..c26a4540 100644
--- a/blocks/MemberDefDict.cs
+++ b/blocks/MemberDefDict.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.blocks {
 	public class TypeDefDict<TValue> {
diff --git a/blocks/Properties/AssemblyInfo.cs b/blocks/Properties/AssemblyInfo.cs
index 168d5fe8..09b38f8b 100644
--- a/blocks/Properties/AssemblyInfo.cs
+++ b/blocks/Properties/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("blocks")]
-[assembly: AssemblyDescription("Modifies dot10 MethodDef bodies")]
+[assembly: AssemblyDescription("Modifies dnlib MethodDef bodies")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("blocks")]
diff --git a/blocks/ScopeBlock.cs b/blocks/ScopeBlock.cs
index 677bd4b8..b6e1d781 100644
--- a/blocks/ScopeBlock.cs
+++ b/blocks/ScopeBlock.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	// A normal branch may not transfer out of a protected block (try block), filter handler,
diff --git a/blocks/TryHandlerBlock.cs b/blocks/TryHandlerBlock.cs
index 9772777d..8598da0e 100644
--- a/blocks/TryHandlerBlock.cs
+++ b/blocks/TryHandlerBlock.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks {
 	// Contains the filter handler block and the catch handler block.
diff --git a/blocks/blocks.csproj b/blocks/blocks.csproj
index 7ce8ee1c..22f41d00 100644
--- a/blocks/blocks.csproj
+++ b/blocks/blocks.csproj
@@ -80,9 +80,9 @@
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\dot10\src\dot10.csproj">
+    <ProjectReference Include="..\dnlib\src\dnlib.csproj">
       <Project>{FDFC1237-143F-4919-8318-4926901F4639}</Project>
-      <Name>dot10</Name>
+      <Name>dnlib</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/blocks/cflow/BlockCflowDeobfuscator.cs b/blocks/cflow/BlockCflowDeobfuscator.cs
index 8e0d1747..b9150219 100644
--- a/blocks/cflow/BlockCflowDeobfuscator.cs
+++ b/blocks/cflow/BlockCflowDeobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	class BlockCflowDeobfuscator : BlockDeobfuscator, IBranchHandler {
diff --git a/blocks/cflow/BlocksCflowDeobfuscator.cs b/blocks/cflow/BlocksCflowDeobfuscator.cs
index d21e6ad9..9a3f42ba 100644
--- a/blocks/cflow/BlocksCflowDeobfuscator.cs
+++ b/blocks/cflow/BlocksCflowDeobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	public class BlocksCflowDeobfuscator {
diff --git a/blocks/cflow/BranchEmulator.cs b/blocks/cflow/BranchEmulator.cs
index f0a89639..3bd2ccd9 100644
--- a/blocks/cflow/BranchEmulator.cs
+++ b/blocks/cflow/BranchEmulator.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	public interface IBranchHandler {
diff --git a/blocks/cflow/CachedCflowDeobfuscator.cs b/blocks/cflow/CachedCflowDeobfuscator.cs
index 273951b6..23f7fde4 100644
--- a/blocks/cflow/CachedCflowDeobfuscator.cs
+++ b/blocks/cflow/CachedCflowDeobfuscator.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	// Only deobfuscates a method once. A copy of the method (now deobfuscated) is returned.
diff --git a/blocks/cflow/CflowDeobfuscator.cs b/blocks/cflow/CflowDeobfuscator.cs
index 9452094d..cc2ec5d4 100644
--- a/blocks/cflow/CflowDeobfuscator.cs
+++ b/blocks/cflow/CflowDeobfuscator.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	public class CflowDeobfuscator : ICflowDeobfuscator {
diff --git a/blocks/cflow/ConstantsFolder.cs b/blocks/cflow/ConstantsFolder.cs
index 6e809069..5ee56c0f 100644
--- a/blocks/cflow/ConstantsFolder.cs
+++ b/blocks/cflow/ConstantsFolder.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.blocks.cflow {
diff --git a/blocks/cflow/DeadCodeRemover.cs b/blocks/cflow/DeadCodeRemover.cs
index 07b1f77d..621fb97e 100644
--- a/blocks/cflow/DeadCodeRemover.cs
+++ b/blocks/cflow/DeadCodeRemover.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	// Removes dead code that is the result of one of our optimizations, or created by the
diff --git a/blocks/cflow/DeadStoreRemover.cs b/blocks/cflow/DeadStoreRemover.cs
index 9689af91..7ff1943a 100644
--- a/blocks/cflow/DeadStoreRemover.cs
+++ b/blocks/cflow/DeadStoreRemover.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	// Removes dead stores by replacing the stloc with a pop. Other optimizations will notice it's
diff --git a/blocks/cflow/ICflowDeobfuscator.cs b/blocks/cflow/ICflowDeobfuscator.cs
index d5897254..ce53f684 100644
--- a/blocks/cflow/ICflowDeobfuscator.cs
+++ b/blocks/cflow/ICflowDeobfuscator.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.blocks.cflow {
 	public interface ICflowDeobfuscator {
diff --git a/blocks/cflow/InstructionEmulator.cs b/blocks/cflow/InstructionEmulator.cs
index b49200ea..725ce5cc 100644
--- a/blocks/cflow/InstructionEmulator.cs
+++ b/blocks/cflow/InstructionEmulator.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	public class InstructionEmulator {
diff --git a/blocks/cflow/MethodCallInliner.cs b/blocks/cflow/MethodCallInliner.cs
index 17f209b7..0eea2705 100644
--- a/blocks/cflow/MethodCallInliner.cs
+++ b/blocks/cflow/MethodCallInliner.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	public class MethodCallInliner : MethodCallInlinerBase {
diff --git a/blocks/cflow/MethodCallInlinerBase.cs b/blocks/cflow/MethodCallInlinerBase.cs
index 4e30906f..2723a0b0 100644
--- a/blocks/cflow/MethodCallInlinerBase.cs
+++ b/blocks/cflow/MethodCallInlinerBase.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	public abstract class MethodCallInlinerBase : IBlocksDeobfuscator {
diff --git a/blocks/cflow/StLdlocFixer.cs b/blocks/cflow/StLdlocFixer.cs
index f0547e8b..a6a3f560 100644
--- a/blocks/cflow/StLdlocFixer.cs
+++ b/blocks/cflow/StLdlocFixer.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	// Replace stloc + ldloc with dup + stloc
diff --git a/blocks/cflow/SwitchCflowDeobfuscator.cs b/blocks/cflow/SwitchCflowDeobfuscator.cs
index a4e73112..ab0b7f3c 100644
--- a/blocks/cflow/SwitchCflowDeobfuscator.cs
+++ b/blocks/cflow/SwitchCflowDeobfuscator.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.blocks.cflow {
 	class SwitchCflowDeobfuscator : BlockDeobfuscator {
diff --git a/de4dot.code/AssemblyClient/AssemblyClientFactory.cs b/de4dot.code/AssemblyClient/AssemblyClientFactory.cs
index ed302653..57af86af 100644
--- a/de4dot.code/AssemblyClient/AssemblyClientFactory.cs
+++ b/de4dot.code/AssemblyClient/AssemblyClientFactory.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.AssemblyClient {
 	public interface IAssemblyClientFactory {
diff --git a/de4dot.code/AssemblyModule.cs b/de4dot.code/AssemblyModule.cs
index a4150619..8c483670 100644
--- a/de4dot.code/AssemblyModule.cs
+++ b/de4dot.code/AssemblyModule.cs
@@ -20,8 +20,8 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Writer;
+using dnlib.DotNet;
+using dnlib.DotNet.Writer;
 using de4dot.blocks;
 
 namespace de4dot.code {
diff --git a/de4dot.code/AssemblyResolver.cs b/de4dot.code/AssemblyResolver.cs
index c8ad154f..648405ff 100644
--- a/de4dot.code/AssemblyResolver.cs
+++ b/de4dot.code/AssemblyResolver.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code {
 	public class TheAssemblyResolver : AssemblyResolver {
diff --git a/de4dot.code/DeobfuscatorContext.cs b/de4dot.code/DeobfuscatorContext.cs
index d0d22023..65ecc5f0 100644
--- a/de4dot.code/DeobfuscatorContext.cs
+++ b/de4dot.code/DeobfuscatorContext.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code {
diff --git a/de4dot.code/DumpedMethodsRestorer.cs b/de4dot.code/DumpedMethodsRestorer.cs
index 935fc3d1..67b97ec3 100644
--- a/de4dot.code/DumpedMethodsRestorer.cs
+++ b/de4dot.code/DumpedMethodsRestorer.cs
@@ -18,10 +18,10 @@
 */
 
 using System.Collections.Generic;
-using dot10.PE;
-using dot10.DotNet.MD;
-using dot10.DotNet.Emit;
-using dot10.DotNet;
+using dnlib.PE;
+using dnlib.DotNet.MD;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code {
diff --git a/de4dot.code/IDeobfuscatorContext.cs b/de4dot.code/IDeobfuscatorContext.cs
index 6efa3126..11918c45 100644
--- a/de4dot.code/IDeobfuscatorContext.cs
+++ b/de4dot.code/IDeobfuscatorContext.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code {
 	public interface IDeobfuscatorContext {
diff --git a/de4dot.code/IObfuscatedFile.cs b/de4dot.code/IObfuscatedFile.cs
index ccde1f7d..8d007862 100644
--- a/de4dot.code/IObfuscatedFile.cs
+++ b/de4dot.code/IObfuscatedFile.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using de4dot.code.deobfuscators;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.code.renamer;
 
 namespace de4dot.code {
diff --git a/de4dot.code/Logger.cs b/de4dot.code/Logger.cs
index 1286dea1..4b3073a9 100644
--- a/de4dot.code/Logger.cs
+++ b/de4dot.code/Logger.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code {
 	public class Logger : ILogger {
diff --git a/de4dot.code/MethodPrinter.cs b/de4dot.code/MethodPrinter.cs
index 79c46969..17d6daf3 100644
--- a/de4dot.code/MethodPrinter.cs
+++ b/de4dot.code/MethodPrinter.cs
@@ -19,8 +19,8 @@
 
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code {
diff --git a/de4dot.code/MethodReturnValueInliner.cs b/de4dot.code/MethodReturnValueInliner.cs
index 856e83ca..2c7417cc 100644
--- a/de4dot.code/MethodReturnValueInliner.cs
+++ b/de4dot.code/MethodReturnValueInliner.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code {
diff --git a/de4dot.code/ObfuscatedFile.cs b/de4dot.code/ObfuscatedFile.cs
index d8833226..9876f5c9 100644
--- a/de4dot.code/ObfuscatedFile.cs
+++ b/de4dot.code/ObfuscatedFile.cs
@@ -22,10 +22,10 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
-using dot10.DotNet.Writer;
-using dot10.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet.Writer;
+using dnlib.PE;
 using de4dot.code.deobfuscators;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
diff --git a/de4dot.code/StringInliner.cs b/de4dot.code/StringInliner.cs
index bbdb73ed..46ed5112 100644
--- a/de4dot.code/StringInliner.cs
+++ b/de4dot.code/StringInliner.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.code.AssemblyClient;
 using de4dot.blocks;
 
diff --git a/de4dot.code/Utils.cs b/de4dot.code/Utils.cs
index d3caac88..1ebaaf9e 100644
--- a/de4dot.code/Utils.cs
+++ b/de4dot.code/Utils.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.DotNet;
-using dot10.IO;
+using dnlib.DotNet;
+using dnlib.IO;
 
 namespace de4dot.code {
 	// These are in .NET 3.5 and later...
diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj
index 23b9cd7e..a2c1d13c 100644
--- a/de4dot.code/de4dot.code.csproj
+++ b/de4dot.code/de4dot.code.csproj
@@ -340,9 +340,9 @@
       <Project>{5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}</Project>
       <Name>de4dot.mdecrypt</Name>
     </ProjectReference>
-    <ProjectReference Include="..\dot10\src\dot10.csproj">
+    <ProjectReference Include="..\dnlib\src\dnlib.csproj">
       <Project>{FDFC1237-143F-4919-8318-4926901F4639}</Project>
-      <Name>dot10</Name>
+      <Name>dnlib</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs b/de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs
index 3b45e888..724d1c9d 100644
--- a/de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET {
diff --git a/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs b/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs
index a8ef2b99..983d6e43 100644
--- a/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.IO;
-using dot10.PE;
-using dot10.DotNet;
+using dnlib.IO;
+using dnlib.PE;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET {
diff --git a/de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs b/de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs
index e82bc68b..5da35515 100644
--- a/de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs
@@ -20,10 +20,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.PE;
-using dot10.DotNet;
-using dot10.DotNet.MD;
+using dnlib.IO;
+using dnlib.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.MD;
 using de4dot.blocks;
 using de4dot.code.AssemblyClient;
 
diff --git a/de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs b/de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs
index c2026dda..fa913f02 100644
--- a/de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET {
diff --git a/de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs b/de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs
index 43a198aa..f2febb9c 100644
--- a/de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs
@@ -20,8 +20,8 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using dot10.IO;
-using dot10.DotNet;
+using dnlib.IO;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET {
diff --git a/de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs b/de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs
index 7313c5e9..50311b20 100644
--- a/de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET {
diff --git a/de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs b/de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs
index 14685340..0491082b 100644
--- a/de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.Agile_NET {
 	class StringDecrypter {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs
index 3e8f3414..f54c11eb 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs b/de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs
index 238a5fd9..b12cbf52 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs
index 375f0076..4d5fbe59 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
+using dnlib.IO;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs
index 25519755..a3b3f0c0 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs b/de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs
index 1d12513c..29d258ee 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
 	class FieldsInfo {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs b/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs
index aa6672d4..3eac3981 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using de4dot.blocks;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
 	partial class OpCodeHandler {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs b/de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs
index 10c77360..1a8a2012 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Agile_NET.vm {
diff --git a/de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs b/de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs
index 4d306ca9..a7a1347e 100644
--- a/de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs
+++ b/de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/ArrayFinder.cs b/de4dot.code/deobfuscators/ArrayFinder.cs
index dc1c1ae4..d5e7a6ec 100644
--- a/de4dot.code/deobfuscators/ArrayFinder.cs
+++ b/de4dot.code/deobfuscators/ArrayFinder.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Babel_NET/AssemblyResolver.cs b/de4dot.code/deobfuscators/Babel_NET/AssemblyResolver.cs
index 762c97f4..1cbb1ce9 100644
--- a/de4dot.code/deobfuscators/Babel_NET/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/AssemblyResolver.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
+using dnlib.IO;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/BabelMethodCallInliner.cs b/de4dot.code/deobfuscators/Babel_NET/BabelMethodCallInliner.cs
index 370b29b3..836eac40 100644
--- a/de4dot.code/deobfuscators/Babel_NET/BabelMethodCallInliner.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/BabelMethodCallInliner.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Babel_NET/BabelUtils.cs b/de4dot.code/deobfuscators/Babel_NET/BabelUtils.cs
index c216959e..0b2e2243 100644
--- a/de4dot.code/deobfuscators/Babel_NET/BabelUtils.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/BabelUtils.cs
@@ -19,8 +19,8 @@
 
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs b/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs
index 3be4ba61..7fa80638 100644
--- a/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs
@@ -21,9 +21,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/Deobfuscator.cs b/de4dot.code/deobfuscators/Babel_NET/Deobfuscator.cs
index 534d7e17..69f73abf 100644
--- a/de4dot.code/deobfuscators/Babel_NET/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/Deobfuscator.cs
@@ -19,7 +19,7 @@
 
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs b/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs
index f5ed7ead..156e2b76 100644
--- a/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs
@@ -22,13 +22,13 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.IO;
 using System.Text;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 using CR = System.Runtime.InteropServices;
-using DR = dot10.DotNet;
+using DR = dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
 	class ImageReader {
diff --git a/de4dot.code/deobfuscators/Babel_NET/InflaterCreator.cs b/de4dot.code/deobfuscators/Babel_NET/InflaterCreator.cs
index add950db..39174c94 100644
--- a/de4dot.code/deobfuscators/Babel_NET/InflaterCreator.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/InflaterCreator.cs
@@ -18,8 +18,8 @@
 */
 
 using ICSharpCode.SharpZipLib.Zip.Compression;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/MemberReferenceConverter.cs b/de4dot.code/deobfuscators/Babel_NET/MemberReferenceConverter.cs
index d636a12a..88890e11 100644
--- a/de4dot.code/deobfuscators/Babel_NET/MemberReferenceConverter.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/MemberReferenceConverter.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/MethodBodyReader.cs b/de4dot.code/deobfuscators/Babel_NET/MethodBodyReader.cs
index 34436bd0..27f96fa0 100644
--- a/de4dot.code/deobfuscators/Babel_NET/MethodBodyReader.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/MethodBodyReader.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
 	class MethodBodyReader : MethodBodyReaderBase {
diff --git a/de4dot.code/deobfuscators/Babel_NET/MethodReferenceReader.cs b/de4dot.code/deobfuscators/Babel_NET/MethodReferenceReader.cs
index ee545cd5..a92f7828 100644
--- a/de4dot.code/deobfuscators/Babel_NET/MethodReferenceReader.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/MethodReferenceReader.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
 	class BabelMethodreference {
diff --git a/de4dot.code/deobfuscators/Babel_NET/MethodsDecrypter.cs b/de4dot.code/deobfuscators/Babel_NET/MethodsDecrypter.cs
index 6b6ee0ed..918058ad 100644
--- a/de4dot.code/deobfuscators/Babel_NET/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/MethodsDecrypter.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/ProxyCallFixer.cs b/de4dot.code/deobfuscators/Babel_NET/ProxyCallFixer.cs
index c522e8c9..8338192a 100644
--- a/de4dot.code/deobfuscators/Babel_NET/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/ProxyCallFixer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/ResourceDecrypter.cs b/de4dot.code/deobfuscators/Babel_NET/ResourceDecrypter.cs
index 93ff93b5..add1c10d 100644
--- a/de4dot.code/deobfuscators/Babel_NET/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/ResourceDecrypter.cs
@@ -20,8 +20,8 @@
 using System;
 using System.IO;
 using ICSharpCode.SharpZipLib.Zip.Compression;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/ResourceResolver.cs b/de4dot.code/deobfuscators/Babel_NET/ResourceResolver.cs
index 6b35dc88..f9f7e8e1 100644
--- a/de4dot.code/deobfuscators/Babel_NET/ResourceResolver.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/ResourceResolver.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Babel_NET {
diff --git a/de4dot.code/deobfuscators/Babel_NET/StringDecrypter.cs b/de4dot.code/deobfuscators/Babel_NET/StringDecrypter.cs
index d0f61cce..486e674f 100644
--- a/de4dot.code/deobfuscators/Babel_NET/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Babel_NET/StringDecrypter.cs
@@ -21,9 +21,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/CodeFort/AssemblyDecrypter.cs b/de4dot.code/deobfuscators/CodeFort/AssemblyDecrypter.cs
index 5f76e36f..25dfd5d2 100644
--- a/de4dot.code/deobfuscators/CodeFort/AssemblyDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeFort/AssemblyDecrypter.cs
@@ -23,9 +23,9 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeFort {
diff --git a/de4dot.code/deobfuscators/CodeFort/CfMethodCallInliner.cs b/de4dot.code/deobfuscators/CodeFort/CfMethodCallInliner.cs
index 84916b3b..69fd9347 100644
--- a/de4dot.code/deobfuscators/CodeFort/CfMethodCallInliner.cs
+++ b/de4dot.code/deobfuscators/CodeFort/CfMethodCallInliner.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/CodeFort/Deobfuscator.cs b/de4dot.code/deobfuscators/CodeFort/Deobfuscator.cs
index 355f15cd..7af140f5 100644
--- a/de4dot.code/deobfuscators/CodeFort/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/CodeFort/Deobfuscator.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeFort {
diff --git a/de4dot.code/deobfuscators/CodeFort/PasswordFinder.cs b/de4dot.code/deobfuscators/CodeFort/PasswordFinder.cs
index b3428ae8..65777f1d 100644
--- a/de4dot.code/deobfuscators/CodeFort/PasswordFinder.cs
+++ b/de4dot.code/deobfuscators/CodeFort/PasswordFinder.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Reflection.Emit;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.CodeFort {
 	class PasswordInfo {
diff --git a/de4dot.code/deobfuscators/CodeFort/ProxyCallFixer.cs b/de4dot.code/deobfuscators/CodeFort/ProxyCallFixer.cs
index 60c55c4d..e808ea2f 100644
--- a/de4dot.code/deobfuscators/CodeFort/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/CodeFort/ProxyCallFixer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeFort {
diff --git a/de4dot.code/deobfuscators/CodeFort/StringDecrypter.cs b/de4dot.code/deobfuscators/CodeFort/StringDecrypter.cs
index b38a5a0d..eec84189 100644
--- a/de4dot.code/deobfuscators/CodeFort/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeFort/StringDecrypter.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeFort {
diff --git a/de4dot.code/deobfuscators/CodeVeil/AssemblyResolver.cs b/de4dot.code/deobfuscators/CodeVeil/AssemblyResolver.cs
index a0f09700..f8170aec 100644
--- a/de4dot.code/deobfuscators/CodeVeil/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/AssemblyResolver.cs
@@ -20,9 +20,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/Deobfuscator.cs b/de4dot.code/deobfuscators/CodeVeil/Deobfuscator.cs
index cd036737..ab383763 100644
--- a/de4dot.code/deobfuscators/CodeVeil/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/Deobfuscator.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/ErexResourceReader.cs b/de4dot.code/deobfuscators/CodeVeil/ErexResourceReader.cs
index 80eb5c7d..d6d70abc 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ErexResourceReader.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ErexResourceReader.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.IO;
-using dot10.IO;
+using dnlib.IO;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
 	class ErexResourceReader {
diff --git a/de4dot.code/deobfuscators/CodeVeil/InvalidMethodsFinder.cs b/de4dot.code/deobfuscators/CodeVeil/InvalidMethodsFinder.cs
index 01376f31..6587bf77 100644
--- a/de4dot.code/deobfuscators/CodeVeil/InvalidMethodsFinder.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/InvalidMethodsFinder.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
 	class InvalidMethodsFinder {
diff --git a/de4dot.code/deobfuscators/CodeVeil/MainType.cs b/de4dot.code/deobfuscators/CodeVeil/MainType.cs
index 7c79ae46..ddfda32d 100644
--- a/de4dot.code/deobfuscators/CodeVeil/MainType.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/MainType.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs
index d2c90e8f..768e6854 100644
--- a/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/ProxyCallFixer.cs b/de4dot.code/deobfuscators/CodeVeil/ProxyCallFixer.cs
index e9310f17..71e964bc 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ProxyCallFixer.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/ResourceConverter.cs b/de4dot.code/deobfuscators/CodeVeil/ResourceConverter.cs
index 34d2c3cf..5fa4ab75 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ResourceConverter.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ResourceConverter.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
+using dnlib.IO;
+using dnlib.DotNet;
 using de4dot.code.resources;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs
index 29509ffa..18630250 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/ResourceInfo.cs b/de4dot.code/deobfuscators/CodeVeil/ResourceInfo.cs
index 65698343..d2f23784 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ResourceInfo.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ResourceInfo.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.IO;
+using dnlib.IO;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
 	class ResourceInfo {
diff --git a/de4dot.code/deobfuscators/CodeVeil/ResourceReader.cs b/de4dot.code/deobfuscators/CodeVeil/ResourceReader.cs
index ec286192..c8b33f51 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ResourceReader.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ResourceReader.cs
@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.IO;
+using dnlib.IO;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
 	class ResourceReader {
diff --git a/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs
index 12753dce..1060adb3 100644
--- a/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeVeil/TamperDetection.cs b/de4dot.code/deobfuscators/CodeVeil/TamperDetection.cs
index 8577517d..db5c1a2c 100644
--- a/de4dot.code/deobfuscators/CodeVeil/TamperDetection.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/TamperDetection.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeVeil {
diff --git a/de4dot.code/deobfuscators/CodeWall/AssemblyDecrypter.cs b/de4dot.code/deobfuscators/CodeWall/AssemblyDecrypter.cs
index f781ad84..6c7abb0f 100644
--- a/de4dot.code/deobfuscators/CodeWall/AssemblyDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeWall/AssemblyDecrypter.cs
@@ -22,8 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.code.resources;
 
diff --git a/de4dot.code/deobfuscators/CodeWall/Deobfuscator.cs b/de4dot.code/deobfuscators/CodeWall/Deobfuscator.cs
index 64ff5a99..819a5538 100644
--- a/de4dot.code/deobfuscators/CodeWall/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/CodeWall/Deobfuscator.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeWall {
diff --git a/de4dot.code/deobfuscators/CodeWall/MethodsDecrypter.cs b/de4dot.code/deobfuscators/CodeWall/MethodsDecrypter.cs
index 4fbe062d..6395845b 100644
--- a/de4dot.code/deobfuscators/CodeWall/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeWall/MethodsDecrypter.cs
@@ -18,8 +18,8 @@
 */
 
 using System;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeWall {
diff --git a/de4dot.code/deobfuscators/CodeWall/StringDecrypter.cs b/de4dot.code/deobfuscators/CodeWall/StringDecrypter.cs
index a40af6b9..b9375b71 100644
--- a/de4dot.code/deobfuscators/CodeWall/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeWall/StringDecrypter.cs
@@ -21,9 +21,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CodeWall {
diff --git a/de4dot.code/deobfuscators/ConstantsReader.cs b/de4dot.code/deobfuscators/ConstantsReader.cs
index 8326677f..2a4d3eed 100644
--- a/de4dot.code/deobfuscators/ConstantsReader.cs
+++ b/de4dot.code/deobfuscators/ConstantsReader.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/AntiDebugger.cs b/de4dot.code/deobfuscators/CryptoObfuscator/AntiDebugger.cs
index 389c103e..777f1ebe 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/AntiDebugger.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/AntiDebugger.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/AssemblyResolver.cs b/de4dot.code/deobfuscators/CryptoObfuscator/AssemblyResolver.cs
index c2dd5bcb..c4489a3c 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/AssemblyResolver.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/CoUtils.cs b/de4dot.code/deobfuscators/CryptoObfuscator/CoUtils.cs
index 393ba849..c791ab7a 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/CoUtils.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/CoUtils.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/ConstantsDecrypter.cs b/de4dot.code/deobfuscators/CryptoObfuscator/ConstantsDecrypter.cs
index 00cf2698..a6358c95 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/ConstantsDecrypter.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/ConstantsDecrypter.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.IO;
-using dot10.DotNet;
+using dnlib.IO;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs b/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs
index 94dd2999..1a28261c 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/MethodBodyReader.cs b/de4dot.code/deobfuscators/CryptoObfuscator/MethodBodyReader.cs
index 9902db32..e73aabac 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/MethodBodyReader.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/MethodBodyReader.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/MethodsDecrypter.cs b/de4dot.code/deobfuscators/CryptoObfuscator/MethodsDecrypter.cs
index 43fbf26c..c8653fb4 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/MethodsDecrypter.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/ProxyCallFixer.cs b/de4dot.code/deobfuscators/CryptoObfuscator/ProxyCallFixer.cs
index 1d68495e..d5be9ba0 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/ProxyCallFixer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs b/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
index f4b9b598..01dcb1e8 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
@@ -22,8 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Security.Cryptography;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/ResourceResolver.cs b/de4dot.code/deobfuscators/CryptoObfuscator/ResourceResolver.cs
index b8ae763f..9d58ed9d 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/ResourceResolver.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/ResourceResolver.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/StringDecrypter.cs b/de4dot.code/deobfuscators/CryptoObfuscator/StringDecrypter.cs
index ceb85b26..ab8c9a20 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/StringDecrypter.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/TamperDetection.cs b/de4dot.code/deobfuscators/CryptoObfuscator/TamperDetection.cs
index fa3ac9b3..9ea8ba90 100644
--- a/de4dot.code/deobfuscators/CryptoObfuscator/TamperDetection.cs
+++ b/de4dot.code/deobfuscators/CryptoObfuscator/TamperDetection.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.CryptoObfuscator {
diff --git a/de4dot.code/deobfuscators/DeepSea/ArrayBlockDeobfuscator.cs b/de4dot.code/deobfuscators/DeepSea/ArrayBlockDeobfuscator.cs
index 2d6a6fca..d58e7df5 100644
--- a/de4dot.code/deobfuscators/DeepSea/ArrayBlockDeobfuscator.cs
+++ b/de4dot.code/deobfuscators/DeepSea/ArrayBlockDeobfuscator.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/DeepSea/ArrayBlockState.cs b/de4dot.code/deobfuscators/DeepSea/ArrayBlockState.cs
index 7ebef092..b0121c4a 100644
--- a/de4dot.code/deobfuscators/DeepSea/ArrayBlockState.cs
+++ b/de4dot.code/deobfuscators/DeepSea/ArrayBlockState.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/AssemblyResolver.cs b/de4dot.code/deobfuscators/DeepSea/AssemblyResolver.cs
index 587acfb2..5d9dabf2 100644
--- a/de4dot.code/deobfuscators/DeepSea/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/DeepSea/AssemblyResolver.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/CastDeobfuscator.cs b/de4dot.code/deobfuscators/DeepSea/CastDeobfuscator.cs
index 798debcc..72c259c4 100644
--- a/de4dot.code/deobfuscators/DeepSea/CastDeobfuscator.cs
+++ b/de4dot.code/deobfuscators/DeepSea/CastDeobfuscator.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.code.deobfuscators.DeepSea {
 	class CastDeobfuscator : IBlocksDeobfuscator {
diff --git a/de4dot.code/deobfuscators/DeepSea/Deobfuscator.cs b/de4dot.code/deobfuscators/DeepSea/Deobfuscator.cs
index 9d9e45c5..fe586777 100644
--- a/de4dot.code/deobfuscators/DeepSea/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/DeepSea/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/DeepSea/DsConstantsReader.cs b/de4dot.code/deobfuscators/DeepSea/DsConstantsReader.cs
index 02b94d18..d225bc48 100644
--- a/de4dot.code/deobfuscators/DeepSea/DsConstantsReader.cs
+++ b/de4dot.code/deobfuscators/DeepSea/DsConstantsReader.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/DsInlinedMethodsFinder.cs b/de4dot.code/deobfuscators/DeepSea/DsInlinedMethodsFinder.cs
index c4c5f5b5..9047513d 100644
--- a/de4dot.code/deobfuscators/DeepSea/DsInlinedMethodsFinder.cs
+++ b/de4dot.code/deobfuscators/DeepSea/DsInlinedMethodsFinder.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.DeepSea {
 	static class DsInlinedMethodsFinder {
diff --git a/de4dot.code/deobfuscators/DeepSea/DsMethodCallInliner.cs b/de4dot.code/deobfuscators/DeepSea/DsMethodCallInliner.cs
index 98ca06fa..39c429e2 100644
--- a/de4dot.code/deobfuscators/DeepSea/DsMethodCallInliner.cs
+++ b/de4dot.code/deobfuscators/DeepSea/DsMethodCallInliner.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/DeepSea/DsUtils.cs b/de4dot.code/deobfuscators/DeepSea/DsUtils.cs
index f3734d15..a248c723 100644
--- a/de4dot.code/deobfuscators/DeepSea/DsUtils.cs
+++ b/de4dot.code/deobfuscators/DeepSea/DsUtils.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/FieldsRestorer.cs b/de4dot.code/deobfuscators/DeepSea/FieldsRestorer.cs
index 5da3f1f3..a348e989 100644
--- a/de4dot.code/deobfuscators/DeepSea/FieldsRestorer.cs
+++ b/de4dot.code/deobfuscators/DeepSea/FieldsRestorer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/ResolverBase.cs b/de4dot.code/deobfuscators/DeepSea/ResolverBase.cs
index ea764de2..02090765 100644
--- a/de4dot.code/deobfuscators/DeepSea/ResolverBase.cs
+++ b/de4dot.code/deobfuscators/DeepSea/ResolverBase.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/ResourceResolver.cs b/de4dot.code/deobfuscators/DeepSea/ResourceResolver.cs
index 584aecba..17cb71fe 100644
--- a/de4dot.code/deobfuscators/DeepSea/ResourceResolver.cs
+++ b/de4dot.code/deobfuscators/DeepSea/ResourceResolver.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeepSea/StringDecrypter.cs b/de4dot.code/deobfuscators/DeepSea/StringDecrypter.cs
index 5f987e5a..bbd602fa 100644
--- a/de4dot.code/deobfuscators/DeepSea/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/DeepSea/StringDecrypter.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.DeepSea {
diff --git a/de4dot.code/deobfuscators/DeobUtils.cs b/de4dot.code/deobfuscators/DeobUtils.cs
index b9db95be..aec8cb48 100644
--- a/de4dot.code/deobfuscators/DeobUtils.cs
+++ b/de4dot.code/deobfuscators/DeobUtils.cs
@@ -22,8 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Security.Cryptography;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using ICSharpCode.SharpZipLib.Zip.Compression;
 using de4dot.blocks;
 
diff --git a/de4dot.code/deobfuscators/DeobfuscatorBase.cs b/de4dot.code/deobfuscators/DeobfuscatorBase.cs
index 650f17be..f95f2af0 100644
--- a/de4dot.code/deobfuscators/DeobfuscatorBase.cs
+++ b/de4dot.code/deobfuscators/DeobfuscatorBase.cs
@@ -19,10 +19,10 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
-using dot10.DotNet.Writer;
-using dot10.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet.Writer;
+using dnlib.PE;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs b/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs
index 25f19d15..50605fe9 100644
--- a/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Dotfuscator {
diff --git a/de4dot.code/deobfuscators/Dotfuscator/StringDecrypter.cs b/de4dot.code/deobfuscators/Dotfuscator/StringDecrypter.cs
index ae83b746..98b36c3a 100644
--- a/de4dot.code/deobfuscators/Dotfuscator/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Dotfuscator/StringDecrypter.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Dotfuscator {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/AssemblyResolver.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/AssemblyResolver.cs
index f32f0be2..977a3507 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/AssemblyResolver.cs
@@ -22,8 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/CodeCompilerMethodCallRestorer.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/CodeCompilerMethodCallRestorer.cs
index 7dc9e406..5fcaf683 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/CodeCompilerMethodCallRestorer.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/CodeCompilerMethodCallRestorer.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
 	class CodeCompilerMethodCallRestorer : MethodCallRestorerBase {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/DecrypterType.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/DecrypterType.cs
index 2a8d3639..000f8979 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/DecrypterType.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/DecrypterType.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/Deobfuscator.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/Deobfuscator.cs
index d20472c2..49ecda01 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/Deobfuscator.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.code.renamer;
 
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/Dynocode.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/Dynocode.cs
index 4c9204cf..bff3e9c1 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/Dynocode.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/Dynocode.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/EfConstantsReader.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/EfConstantsReader.cs
index 952535f6..c4204f5b 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/EfConstantsReader.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/EfConstantsReader.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs
index 4829a456..78f40421 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs
index 81808c06..a4fab4ef 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceResolver.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceResolver.cs
index 812b9614..aecf056e 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceResolver.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceResolver.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs
index fe07d7ea..84199420 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/VersionDetector.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/VersionDetector.cs
index ceab4043..dc2dc2ec 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/VersionDetector.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/VersionDetector.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
diff --git a/de4dot.code/deobfuscators/ExceptionLoggerRemover.cs b/de4dot.code/deobfuscators/ExceptionLoggerRemover.cs
index 7c8d5f21..d5b4bf93 100644
--- a/de4dot.code/deobfuscators/ExceptionLoggerRemover.cs
+++ b/de4dot.code/deobfuscators/ExceptionLoggerRemover.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/ArrayDecrypter.cs b/de4dot.code/deobfuscators/Goliath_NET/ArrayDecrypter.cs
index e09c31b5..6263a3f8 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/ArrayDecrypter.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/ArrayDecrypter.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/ArrayValueInliner.cs b/de4dot.code/deobfuscators/Goliath_NET/ArrayValueInliner.cs
index 109cdab5..8704b7a9 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/ArrayValueInliner.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/ArrayValueInliner.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/DecrypterBase.cs b/de4dot.code/deobfuscators/Goliath_NET/DecrypterBase.cs
index dcb1e4ce..fb26d36d 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/DecrypterBase.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/DecrypterBase.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/Deobfuscator.cs b/de4dot.code/deobfuscators/Goliath_NET/Deobfuscator.cs
index b77f1f3c..5b8ed819 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/IntegerDecrypter.cs b/de4dot.code/deobfuscators/Goliath_NET/IntegerDecrypter.cs
index 2b6f526e..10d77142 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/IntegerDecrypter.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/IntegerDecrypter.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/LocalsRestorer.cs b/de4dot.code/deobfuscators/Goliath_NET/LocalsRestorer.cs
index 986266ea..a3094dbb 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/LocalsRestorer.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/LocalsRestorer.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/LogicalExpressionFixer.cs b/de4dot.code/deobfuscators/Goliath_NET/LogicalExpressionFixer.cs
index 32f333c9..d0f14fb0 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/LogicalExpressionFixer.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/LogicalExpressionFixer.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet.Emit;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/ProxyCallFixer.cs b/de4dot.code/deobfuscators/Goliath_NET/ProxyCallFixer.cs
index 5417edea..928799e5 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/ProxyCallFixer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/StringDecrypter.cs b/de4dot.code/deobfuscators/Goliath_NET/StringDecrypter.cs
index 45d823cc..7a6ebd1f 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/StringDecrypter.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/Goliath_NET/StrongNameChecker.cs b/de4dot.code/deobfuscators/Goliath_NET/StrongNameChecker.cs
index 6541873f..fc80d8f7 100644
--- a/de4dot.code/deobfuscators/Goliath_NET/StrongNameChecker.cs
+++ b/de4dot.code/deobfuscators/Goliath_NET/StrongNameChecker.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Goliath_NET {
diff --git a/de4dot.code/deobfuscators/IDeobfuscator.cs b/de4dot.code/deobfuscators/IDeobfuscator.cs
index a65b7aa1..479a638d 100644
--- a/de4dot.code/deobfuscators/IDeobfuscator.cs
+++ b/de4dot.code/deobfuscators/IDeobfuscator.cs
@@ -19,9 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.PE;
-using dot10.DotNet;
-using dot10.DotNet.Writer;
+using dnlib.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.Writer;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 using de4dot.code.renamer;
diff --git a/de4dot.code/deobfuscators/ILProtector/Deobfuscator.cs b/de4dot.code/deobfuscators/ILProtector/Deobfuscator.cs
index db55962a..77307219 100644
--- a/de4dot.code/deobfuscators/ILProtector/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/ILProtector/Deobfuscator.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.ILProtector {
diff --git a/de4dot.code/deobfuscators/ILProtector/MainType.cs b/de4dot.code/deobfuscators/ILProtector/MainType.cs
index 986dcd75..8a512dbc 100644
--- a/de4dot.code/deobfuscators/ILProtector/MainType.cs
+++ b/de4dot.code/deobfuscators/ILProtector/MainType.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.ILProtector {
diff --git a/de4dot.code/deobfuscators/ILProtector/MethodReader.cs b/de4dot.code/deobfuscators/ILProtector/MethodReader.cs
index b3d311c4..8e835791 100644
--- a/de4dot.code/deobfuscators/ILProtector/MethodReader.cs
+++ b/de4dot.code/deobfuscators/ILProtector/MethodReader.cs
@@ -20,10 +20,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.MD;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.MD;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.ILProtector {
diff --git a/de4dot.code/deobfuscators/ILProtector/MethodsDecrypter.cs b/de4dot.code/deobfuscators/ILProtector/MethodsDecrypter.cs
index b75d0af5..81e7d3dd 100644
--- a/de4dot.code/deobfuscators/ILProtector/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/ILProtector/MethodsDecrypter.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.ILProtector {
@@ -375,7 +375,7 @@ namespace de4dot.code.deobfuscators.ILProtector {
 		}
 
 		static void restoreMethod(MethodDef method, MethodReader methodReader) {
-			// body.MaxStackSize = <let dot10 calculate this>
+			// body.MaxStackSize = <let dnlib calculate this>
 			method.Body.InitLocals = methodReader.InitLocals;
 			methodReader.RestoreMethod(method);
 		}
diff --git a/de4dot.code/deobfuscators/ISimpleDeobfuscator.cs b/de4dot.code/deobfuscators/ISimpleDeobfuscator.cs
index a1749e38..50e66dde 100644
--- a/de4dot.code/deobfuscators/ISimpleDeobfuscator.cs
+++ b/de4dot.code/deobfuscators/ISimpleDeobfuscator.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators {
 	public interface ISimpleDeobfuscator {
diff --git a/de4dot.code/deobfuscators/InitializedDataCreator.cs b/de4dot.code/deobfuscators/InitializedDataCreator.cs
index 0450751e..16fe6f69 100644
--- a/de4dot.code/deobfuscators/InitializedDataCreator.cs
+++ b/de4dot.code/deobfuscators/InitializedDataCreator.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/InlinedMethodsFinder.cs b/de4dot.code/deobfuscators/InlinedMethodsFinder.cs
index 2bcc386c..486c8d5c 100644
--- a/de4dot.code/deobfuscators/InlinedMethodsFinder.cs
+++ b/de4dot.code/deobfuscators/InlinedMethodsFinder.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs b/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs
index 55f374fa..ec258351 100644
--- a/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/MPRESS/Deobfuscator.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
-using dot10.PE;
-using dot10.DotNet;
+using dnlib.PE;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.MPRESS {
diff --git a/de4dot.code/deobfuscators/MaxtoCode/Deobfuscator.cs b/de4dot.code/deobfuscators/MaxtoCode/Deobfuscator.cs
index aca01176..9f357b29 100644
--- a/de4dot.code/deobfuscators/MaxtoCode/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/MaxtoCode/Deobfuscator.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.MaxtoCode {
diff --git a/de4dot.code/deobfuscators/MaxtoCode/MainType.cs b/de4dot.code/deobfuscators/MaxtoCode/MainType.cs
index a39f62a2..70cbe46a 100644
--- a/de4dot.code/deobfuscators/MaxtoCode/MainType.cs
+++ b/de4dot.code/deobfuscators/MaxtoCode/MainType.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.MaxtoCode {
diff --git a/de4dot.code/deobfuscators/MaxtoCode/MethodsDecrypter.cs b/de4dot.code/deobfuscators/MaxtoCode/MethodsDecrypter.cs
index 0e8be110..dcac2049 100644
--- a/de4dot.code/deobfuscators/MaxtoCode/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/MaxtoCode/MethodsDecrypter.cs
@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.IO;
+using dnlib.IO;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.MaxtoCode {
diff --git a/de4dot.code/deobfuscators/MaxtoCode/StringDecrypter.cs b/de4dot.code/deobfuscators/MaxtoCode/StringDecrypter.cs
index 512232ad..e3f84647 100644
--- a/de4dot.code/deobfuscators/MaxtoCode/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/MaxtoCode/StringDecrypter.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.MaxtoCode {
diff --git a/de4dot.code/deobfuscators/MemberReferenceBuilder.cs b/de4dot.code/deobfuscators/MemberReferenceBuilder.cs
index 1822f41a..06ddc919 100644
--- a/de4dot.code/deobfuscators/MemberReferenceBuilder.cs
+++ b/de4dot.code/deobfuscators/MemberReferenceBuilder.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/MethodBodyParser.cs b/de4dot.code/deobfuscators/MethodBodyParser.cs
index a5441c68..f94f1717 100644
--- a/de4dot.code/deobfuscators/MethodBodyParser.cs
+++ b/de4dot.code/deobfuscators/MethodBodyParser.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.IO;
-using dot10.IO;
+using dnlib.IO;
 
 namespace de4dot.code.deobfuscators {
 	[Serializable]
diff --git a/de4dot.code/deobfuscators/MethodCallRestorerBase.cs b/de4dot.code/deobfuscators/MethodCallRestorerBase.cs
index 48ff3833..9a7d804d 100644
--- a/de4dot.code/deobfuscators/MethodCallRestorerBase.cs
+++ b/de4dot.code/deobfuscators/MethodCallRestorerBase.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/MethodCollection.cs b/de4dot.code/deobfuscators/MethodCollection.cs
index 0ac65312..4820827c 100644
--- a/de4dot.code/deobfuscators/MethodCollection.cs
+++ b/de4dot.code/deobfuscators/MethodCollection.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/MethodStack.cs b/de4dot.code/deobfuscators/MethodStack.cs
index da128955..1035969c 100644
--- a/de4dot.code/deobfuscators/MethodStack.cs
+++ b/de4dot.code/deobfuscators/MethodStack.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/MethodsDecrypter.cs b/de4dot.code/deobfuscators/MethodsDecrypter.cs
index 6c052d02..4702c24e 100644
--- a/de4dot.code/deobfuscators/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/MethodsDecrypter.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.code.AssemblyClient;
 using de4dot.blocks;
 using de4dot.mdecrypt;
diff --git a/de4dot.code/deobfuscators/MyPEImage.cs b/de4dot.code/deobfuscators/MyPEImage.cs
index bf9298ea..4e25bc45 100644
--- a/de4dot.code/deobfuscators/MyPEImage.cs
+++ b/de4dot.code/deobfuscators/MyPEImage.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using dot10.IO;
-using dot10.PE;
-using dot10.DotNet.MD;
+using dnlib.IO;
+using dnlib.PE;
+using dnlib.DotNet.MD;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/Operations.cs b/de4dot.code/deobfuscators/Operations.cs
index 0240916d..47c6d64c 100644
--- a/de4dot.code/deobfuscators/Operations.cs
+++ b/de4dot.code/deobfuscators/Operations.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet.Writer;
+using dnlib.DotNet.Writer;
 using de4dot.code.renamer;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/ProxyCallFixerBase.cs b/de4dot.code/deobfuscators/ProxyCallFixerBase.cs
index 09132488..0e489d58 100644
--- a/de4dot.code/deobfuscators/ProxyCallFixerBase.cs
+++ b/de4dot.code/deobfuscators/ProxyCallFixerBase.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/Rummage/Deobfuscator.cs b/de4dot.code/deobfuscators/Rummage/Deobfuscator.cs
index d7a6ad42..5e8d9a3c 100644
--- a/de4dot.code/deobfuscators/Rummage/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Rummage/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Rummage {
diff --git a/de4dot.code/deobfuscators/Rummage/StringDecrypter.cs b/de4dot.code/deobfuscators/Rummage/StringDecrypter.cs
index deaa7a74..f6f40ede 100644
--- a/de4dot.code/deobfuscators/Rummage/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Rummage/StringDecrypter.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Rummage {
diff --git a/de4dot.code/deobfuscators/Skater_NET/Deobfuscator.cs b/de4dot.code/deobfuscators/Skater_NET/Deobfuscator.cs
index 1f317545..271cb41d 100644
--- a/de4dot.code/deobfuscators/Skater_NET/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Skater_NET/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Skater_NET {
diff --git a/de4dot.code/deobfuscators/Skater_NET/EnumClassFinder.cs b/de4dot.code/deobfuscators/Skater_NET/EnumClassFinder.cs
index 0f03a043..32025897 100644
--- a/de4dot.code/deobfuscators/Skater_NET/EnumClassFinder.cs
+++ b/de4dot.code/deobfuscators/Skater_NET/EnumClassFinder.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Skater_NET {
diff --git a/de4dot.code/deobfuscators/Skater_NET/StringDecrypter.cs b/de4dot.code/deobfuscators/Skater_NET/StringDecrypter.cs
index 79530534..263b0b02 100644
--- a/de4dot.code/deobfuscators/Skater_NET/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Skater_NET/StringDecrypter.cs
@@ -23,8 +23,8 @@ using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Skater_NET {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolver.cs b/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolver.cs
index c6ca4f55..68ae8dd6 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolver.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
 	class AssemblyResolver {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs
index 21a849b1..24d0bee6 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/AutomatedErrorReportingFinder.cs b/de4dot.code/deobfuscators/SmartAssembly/AutomatedErrorReportingFinder.cs
index 05939b6c..df251096 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/AutomatedErrorReportingFinder.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/AutomatedErrorReportingFinder.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs b/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs
index 154bee59..beef7ced 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs
@@ -21,8 +21,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs
index a053362c..4cc519ce 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/ProxyCallFixer.cs b/de4dot.code/deobfuscators/SmartAssembly/ProxyCallFixer.cs
index fc1dafa9..837a7632 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/ProxyCallFixer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/ResolverInfoBase.cs b/de4dot.code/deobfuscators/SmartAssembly/ResolverInfoBase.cs
index 5abdcfb9..e07596c0 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/ResolverInfoBase.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/ResolverInfoBase.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypter.cs b/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypter.cs
index 138e550a..a3a0aff4 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypter.cs
@@ -20,7 +20,7 @@
 using System;
 using System.IO;
 using System.Security.Cryptography;
-using dot10.DotNet;
+using dnlib.DotNet;
 using ICSharpCode.SharpZipLib.Zip.Compression;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypterInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypterInfo.cs
index 43afb93a..cce842c0 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypterInfo.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/ResourceDecrypterInfo.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/ResourceResolver.cs b/de4dot.code/deobfuscators/SmartAssembly/ResourceResolver.cs
index 5943e59d..28166890 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/ResourceResolver.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/ResourceResolver.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.IO;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/ResourceResolverInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/ResourceResolverInfo.cs
index 808c1af6..1f382e12 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/ResourceResolverInfo.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/ResourceResolverInfo.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/SimpleZipInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/SimpleZipInfo.cs
index cac9d6b6..f44f6322 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/SimpleZipInfo.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/SimpleZipInfo.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/StringDecrypterInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/StringDecrypterInfo.cs
index 3cfbf588..9620d248 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/StringDecrypterInfo.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/StringDecrypterInfo.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs b/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs
index 4eb767ae..842ef70b 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/SmartAssembly/TamperProtectionRemover.cs b/de4dot.code/deobfuscators/SmartAssembly/TamperProtectionRemover.cs
index 51a2d82e..47f2630d 100644
--- a/de4dot.code/deobfuscators/SmartAssembly/TamperProtectionRemover.cs
+++ b/de4dot.code/deobfuscators/SmartAssembly/TamperProtectionRemover.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.SmartAssembly {
diff --git a/de4dot.code/deobfuscators/Spices_Net/Deobfuscator.cs b/de4dot.code/deobfuscators/Spices_Net/Deobfuscator.cs
index e7f18086..8c606f16 100644
--- a/de4dot.code/deobfuscators/Spices_Net/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Spices_Net/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Spices_Net/ResourceNamesRestorer.cs b/de4dot.code/deobfuscators/Spices_Net/ResourceNamesRestorer.cs
index 775c1a1c..71696cd4 100644
--- a/de4dot.code/deobfuscators/Spices_Net/ResourceNamesRestorer.cs
+++ b/de4dot.code/deobfuscators/Spices_Net/ResourceNamesRestorer.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Spices_Net {
diff --git a/de4dot.code/deobfuscators/Spices_Net/SpicesMethodCallInliner.cs b/de4dot.code/deobfuscators/Spices_Net/SpicesMethodCallInliner.cs
index 264fd07a..409e16e5 100644
--- a/de4dot.code/deobfuscators/Spices_Net/SpicesMethodCallInliner.cs
+++ b/de4dot.code/deobfuscators/Spices_Net/SpicesMethodCallInliner.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/Spices_Net/StringDecrypter.cs b/de4dot.code/deobfuscators/Spices_Net/StringDecrypter.cs
index 241a447a..425a47db 100644
--- a/de4dot.code/deobfuscators/Spices_Net/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Spices_Net/StringDecrypter.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Spices_Net {
diff --git a/de4dot.code/deobfuscators/StringCounts.cs b/de4dot.code/deobfuscators/StringCounts.cs
index e253464f..22b2ae60 100644
--- a/de4dot.code/deobfuscators/StringCounts.cs
+++ b/de4dot.code/deobfuscators/StringCounts.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 
 namespace de4dot.code.deobfuscators {
 	class StringCounts {
diff --git a/de4dot.code/deobfuscators/TypesRestorer.cs b/de4dot.code/deobfuscators/TypesRestorer.cs
index 9aed1bab..8c3114ed 100644
--- a/de4dot.code/deobfuscators/TypesRestorer.cs
+++ b/de4dot.code/deobfuscators/TypesRestorer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/UnusedMethodsFinder.cs b/de4dot.code/deobfuscators/UnusedMethodsFinder.cs
index 70332630..226446a9 100644
--- a/de4dot.code/deobfuscators/UnusedMethodsFinder.cs
+++ b/de4dot.code/deobfuscators/UnusedMethodsFinder.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/ValueInlinerBase.cs b/de4dot.code/deobfuscators/ValueInlinerBase.cs
index b7ab9c7e..5f79c49f 100644
--- a/de4dot.code/deobfuscators/ValueInlinerBase.cs
+++ b/de4dot.code/deobfuscators/ValueInlinerBase.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
diff --git a/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs b/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs
index 13042236..b12d844e 100644
--- a/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.Xenocode {
 	public class DeobfuscatorInfo : DeobfuscatorInfoBase {
diff --git a/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs b/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs
index 4c7e4437..4a44f1d8 100644
--- a/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Xenocode {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs
index 2f9408a1..19a5c9a2 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs
index b8faf232..ffc13143 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs
index da5a8ffc..de5bafd8 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs
@@ -22,10 +22,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using dot10.IO;
-using dot10.PE;
-using dot10.DotNet;
-using dot10.DotNet.MD;
+using dnlib.IO;
+using dnlib.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.MD;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
 	class IniFile {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs
index e6536bc5..387e6790 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs
index 3f2d16fa..3eec7bcd 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
 	class DecryptMethod {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs
index 4743d3b9..7babc8b1 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs
index a31010e8..8ff21a94 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs
@@ -21,10 +21,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using dot10.IO;
-using dot10.PE;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.IO;
+using dnlib.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/LibAssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/LibAssemblyResolver.cs
index 72b9c4c0..33e103a6 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/LibAssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/LibAssemblyResolver.cs
@@ -18,8 +18,8 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs
index c8718af1..a9ccfa0a 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 using de4dot.blocks.cflow;
 
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs
index 45faf868..648d0659 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs
index 64425767..6b788fac 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs
@@ -18,8 +18,8 @@
 */
 
 using System;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs
index affbfe57..7bbc97fb 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.IO;
+using dnlib.DotNet;
+using dnlib.IO;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs
index 93aa59ce..eeaffc16 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs
@@ -18,7 +18,7 @@
 */
 
 using System;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs
index 915eda26..34563260 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs
@@ -21,10 +21,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using dot10.PE;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
-using dot10.DotNet.Writer;
+using dnlib.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet.Writer;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs
index 415d4ccf..680cc614 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs
index 490ba263..a4344245 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs
@@ -21,8 +21,8 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Security.Cryptography;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs
index 111bbc06..8663181d 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs
index 056ed542..ec58c8f7 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs
@@ -20,11 +20,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using dot10.IO;
-using dot10.DotNet;
-using dot10.DotNet.MD;
-using dot10.DotNet.Emit;
-using dot10.DotNet.Writer;
+using dnlib.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.MD;
+using dnlib.DotNet.Emit;
+using dnlib.DotNet.Writer;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs
index e7cea77b..67ca78b3 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs
@@ -20,9 +20,9 @@
 using System;
 using System.IO;
 using ICSharpCode.SharpZipLib.Zip.Compression;
-using dot10.PE;
-using dot10.IO;
-using dot10.DotNet;
+using dnlib.PE;
+using dnlib.IO;
+using dnlib.DotNet;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
 	class NativeImageUnpacker {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/ProxyCallFixer.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ProxyCallFixer.cs
index 4ca4e115..6bd3c332 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/ProxyCallFixer.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ProxyCallFixer.cs
@@ -17,8 +17,8 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs
index b7e54e36..8599ef3d 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs
index 47977682..e77f7eb1 100644
--- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs
@@ -20,9 +20,9 @@
 using System;
 using System.Text;
 using System.Collections.Generic;
-using dot10.PE;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.PE;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
diff --git a/de4dot.code/renamer/ExistingNames.cs b/de4dot.code/renamer/ExistingNames.cs
index d65f70c9..5ea90fab 100644
--- a/de4dot.code/renamer/ExistingNames.cs
+++ b/de4dot.code/renamer/ExistingNames.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer {
 	class ExistingNames {
diff --git a/de4dot.code/renamer/NameCreators.cs b/de4dot.code/renamer/NameCreators.cs
index fc684775..249cf4db 100644
--- a/de4dot.code/renamer/NameCreators.cs
+++ b/de4dot.code/renamer/NameCreators.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.renamer {
diff --git a/de4dot.code/renamer/Renamer.cs b/de4dot.code/renamer/Renamer.cs
index 88c8312f..d7dd288a 100644
--- a/de4dot.code/renamer/Renamer.cs
+++ b/de4dot.code/renamer/Renamer.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.code.renamer.asmmodules;
 using de4dot.blocks;
 
diff --git a/de4dot.code/renamer/ResourceKeysRenamer.cs b/de4dot.code/renamer/ResourceKeysRenamer.cs
index c80cac98..5b3d77f3 100644
--- a/de4dot.code/renamer/ResourceKeysRenamer.cs
+++ b/de4dot.code/renamer/ResourceKeysRenamer.cs
@@ -22,9 +22,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
-using dot10.IO;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
+using dnlib.IO;
 using de4dot.blocks;
 using de4dot.code.resources;
 
diff --git a/de4dot.code/renamer/ResourceRenamer.cs b/de4dot.code/renamer/ResourceRenamer.cs
index 964dfe12..e9ef26f1 100644
--- a/de4dot.code/renamer/ResourceRenamer.cs
+++ b/de4dot.code/renamer/ResourceRenamer.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 using de4dot.code.renamer.asmmodules;
 
diff --git a/de4dot.code/renamer/TypeInfo.cs b/de4dot.code/renamer/TypeInfo.cs
index 0261e1d6..cdab407a 100644
--- a/de4dot.code/renamer/TypeInfo.cs
+++ b/de4dot.code/renamer/TypeInfo.cs
@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.code.renamer.asmmodules;
 using de4dot.blocks;
 
diff --git a/de4dot.code/renamer/TypeNames.cs b/de4dot.code/renamer/TypeNames.cs
index 41adabc8..b9624341 100644
--- a/de4dot.code/renamer/TypeNames.cs
+++ b/de4dot.code/renamer/TypeNames.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer {
 	abstract class TypeNames {
diff --git a/de4dot.code/renamer/TypeRenamerState.cs b/de4dot.code/renamer/TypeRenamerState.cs
index aac24201..9c093b84 100644
--- a/de4dot.code/renamer/TypeRenamerState.cs
+++ b/de4dot.code/renamer/TypeRenamerState.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer {
 	class TypeRenamerState {
diff --git a/de4dot.code/renamer/VariableNameState.cs b/de4dot.code/renamer/VariableNameState.cs
index 09e788ac..6488fe20 100644
--- a/de4dot.code/renamer/VariableNameState.cs
+++ b/de4dot.code/renamer/VariableNameState.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer {
 	class VariableNameState {
diff --git a/de4dot.code/renamer/asmmodules/EventDef.cs b/de4dot.code/renamer/asmmodules/EventDef.cs
index 1f6e1b61..5170bba4 100644
--- a/de4dot.code/renamer/asmmodules/EventDef.cs
+++ b/de4dot.code/renamer/asmmodules/EventDef.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	class MEventDef : Ref {
diff --git a/de4dot.code/renamer/asmmodules/FieldDef.cs b/de4dot.code/renamer/asmmodules/FieldDef.cs
index 854f1e52..2be7d36b 100644
--- a/de4dot.code/renamer/asmmodules/FieldDef.cs
+++ b/de4dot.code/renamer/asmmodules/FieldDef.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	class MFieldDef : Ref {
diff --git a/de4dot.code/renamer/asmmodules/GenericParamDef.cs b/de4dot.code/renamer/asmmodules/GenericParamDef.cs
index 645d5cd9..8c2ad388 100644
--- a/de4dot.code/renamer/asmmodules/GenericParamDef.cs
+++ b/de4dot.code/renamer/asmmodules/GenericParamDef.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	class MGenericParamDef : Ref {
diff --git a/de4dot.code/renamer/asmmodules/IResolver.cs b/de4dot.code/renamer/asmmodules/IResolver.cs
index 03f3003b..f0f57f4e 100644
--- a/de4dot.code/renamer/asmmodules/IResolver.cs
+++ b/de4dot.code/renamer/asmmodules/IResolver.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	interface IResolver {
diff --git a/de4dot.code/renamer/asmmodules/MemberRefFinder.cs b/de4dot.code/renamer/asmmodules/MemberRefFinder.cs
index a3416f33..331fe275 100644
--- a/de4dot.code/renamer/asmmodules/MemberRefFinder.cs
+++ b/de4dot.code/renamer/asmmodules/MemberRefFinder.cs
@@ -19,8 +19,8 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Emit;
+using dnlib.DotNet;
+using dnlib.DotNet.Emit;
 using de4dot.blocks;
 
 namespace de4dot.code.renamer.asmmodules {
diff --git a/de4dot.code/renamer/asmmodules/MethodDef.cs b/de4dot.code/renamer/asmmodules/MethodDef.cs
index 17e5035e..387ee7c9 100644
--- a/de4dot.code/renamer/asmmodules/MethodDef.cs
+++ b/de4dot.code/renamer/asmmodules/MethodDef.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	class MMethodDef : Ref {
diff --git a/de4dot.code/renamer/asmmodules/Module.cs b/de4dot.code/renamer/asmmodules/Module.cs
index d73ebc33..2927186a 100644
--- a/de4dot.code/renamer/asmmodules/Module.cs
+++ b/de4dot.code/renamer/asmmodules/Module.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.renamer.asmmodules {
diff --git a/de4dot.code/renamer/asmmodules/Modules.cs b/de4dot.code/renamer/asmmodules/Modules.cs
index 1ce6472a..9b1f4881 100644
--- a/de4dot.code/renamer/asmmodules/Modules.cs
+++ b/de4dot.code/renamer/asmmodules/Modules.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.renamer.asmmodules {
diff --git a/de4dot.code/renamer/asmmodules/ParamDef.cs b/de4dot.code/renamer/asmmodules/ParamDef.cs
index 6a3bcee9..60c016fa 100644
--- a/de4dot.code/renamer/asmmodules/ParamDef.cs
+++ b/de4dot.code/renamer/asmmodules/ParamDef.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	class MParamDef {
diff --git a/de4dot.code/renamer/asmmodules/PropertyDef.cs b/de4dot.code/renamer/asmmodules/PropertyDef.cs
index eb9a64f4..848845f9 100644
--- a/de4dot.code/renamer/asmmodules/PropertyDef.cs
+++ b/de4dot.code/renamer/asmmodules/PropertyDef.cs
@@ -18,7 +18,7 @@
 */
 
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	class MPropertyDef : Ref {
diff --git a/de4dot.code/renamer/asmmodules/Ref.cs b/de4dot.code/renamer/asmmodules/Ref.cs
index 469a299f..6e933c3f 100644
--- a/de4dot.code/renamer/asmmodules/Ref.cs
+++ b/de4dot.code/renamer/asmmodules/Ref.cs
@@ -17,7 +17,7 @@
     along with de4dot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.renamer.asmmodules {
 	abstract class Ref {
diff --git a/de4dot.code/renamer/asmmodules/TypeDef.cs b/de4dot.code/renamer/asmmodules/TypeDef.cs
index 9614ea0e..12886282 100644
--- a/de4dot.code/renamer/asmmodules/TypeDef.cs
+++ b/de4dot.code/renamer/asmmodules/TypeDef.cs
@@ -19,7 +19,7 @@
 
 using System;
 using System.Collections.Generic;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.blocks;
 
 namespace de4dot.code.renamer.asmmodules {
diff --git a/de4dot.code/resources/ResourceDataCreator.cs b/de4dot.code/resources/ResourceDataCreator.cs
index 6e2d6940..5c2e5afb 100644
--- a/de4dot.code/resources/ResourceDataCreator.cs
+++ b/de4dot.code/resources/ResourceDataCreator.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.resources {
 	class ResourceDataCreator {
diff --git a/de4dot.code/resources/ResourceReader.cs b/de4dot.code/resources/ResourceReader.cs
index ef922b3b..25607d12 100644
--- a/de4dot.code/resources/ResourceReader.cs
+++ b/de4dot.code/resources/ResourceReader.cs
@@ -22,8 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using dot10.DotNet;
-using dot10.IO;
+using dnlib.DotNet;
+using dnlib.IO;
 
 namespace de4dot.code.resources {
 	[Serializable]
diff --git a/de4dot.code/resources/ResourceWriter.cs b/de4dot.code/resources/ResourceWriter.cs
index ab418d88..31775f4c 100644
--- a/de4dot.code/resources/ResourceWriter.cs
+++ b/de4dot.code/resources/ResourceWriter.cs
@@ -23,7 +23,7 @@ using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 
 namespace de4dot.code.resources {
 	class ResourceWriter {
diff --git a/de4dot.cui/CommandLineParser.cs b/de4dot.cui/CommandLineParser.cs
index 1225355c..ede37ce3 100644
--- a/de4dot.cui/CommandLineParser.cs
+++ b/de4dot.cui/CommandLineParser.cs
@@ -20,8 +20,8 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Writer;
+using dnlib.DotNet;
+using dnlib.DotNet.Writer;
 using de4dot.code;
 using de4dot.code.deobfuscators;
 using de4dot.code.AssemblyClient;
diff --git a/de4dot.cui/FilesDeobfuscator.cs b/de4dot.cui/FilesDeobfuscator.cs
index a0e3c08e..15376c33 100644
--- a/de4dot.cui/FilesDeobfuscator.cs
+++ b/de4dot.cui/FilesDeobfuscator.cs
@@ -20,8 +20,8 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using dot10.DotNet;
-using dot10.DotNet.Writer;
+using dnlib.DotNet;
+using dnlib.DotNet.Writer;
 using de4dot.blocks;
 using de4dot.code;
 using de4dot.code.renamer;
diff --git a/de4dot.cui/Program.cs b/de4dot.cui/Program.cs
index 7aa6f305..f8387dc1 100644
--- a/de4dot.cui/Program.cs
+++ b/de4dot.cui/Program.cs
@@ -20,7 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using dot10.DotNet;
+using dnlib.DotNet;
 using de4dot.code;
 using de4dot.code.deobfuscators;
 
diff --git a/de4dot.cui/de4dot.cui.csproj b/de4dot.cui/de4dot.cui.csproj
index 5a8eb7e9..c45e105c 100644
--- a/de4dot.cui/de4dot.cui.csproj
+++ b/de4dot.cui/de4dot.cui.csproj
@@ -51,9 +51,9 @@
       <Project>{4D10B9EB-3BF1-4D61-A389-CB019E8C9622}</Project>
       <Name>de4dot.code</Name>
     </ProjectReference>
-    <ProjectReference Include="..\dot10\src\dot10.csproj">
+    <ProjectReference Include="..\dnlib\src\dnlib.csproj">
       <Project>{FDFC1237-143F-4919-8318-4926901F4639}</Project>
-      <Name>dot10</Name>
+      <Name>dnlib</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/de4dot.mdecrypt/DynamicMethodsDecrypter.cs b/de4dot.mdecrypt/DynamicMethodsDecrypter.cs
index 9ec96de9..4f81d3c9 100644
--- a/de4dot.mdecrypt/DynamicMethodsDecrypter.cs
+++ b/de4dot.mdecrypt/DynamicMethodsDecrypter.cs
@@ -22,8 +22,8 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Reflection;
-using dot10.DotNet;
-using dot10.DotNet.MD;
+using dnlib.DotNet;
+using dnlib.DotNet.MD;
 using de4dot.blocks;
 
 namespace de4dot.mdecrypt {
@@ -92,7 +92,7 @@ namespace de4dot.mdecrypt {
 
 		MDTable methodDefTable;
 		IntPtr methodDefTablePtr;
-		ModuleDefMD dot10Module;
+		ModuleDefMD dnlibModule;
 		MethodDef moduleCctor;
 		uint moduleCctorCodeRva;
 		IntPtr moduleToDecryptScope;
@@ -151,11 +151,11 @@ namespace de4dot.mdecrypt {
 				hInstModule = Marshal.GetHINSTANCE(moduleToDecrypt);
 				moduleToDecryptScope = getScope(moduleToDecrypt);
 
-				dot10Module = ModuleDefMD.Load(hInstModule);
-				methodDefTable = dot10Module.TablesStream.MethodTable;
-				methodDefTablePtr = new IntPtr((byte*)hInstModule + (uint)dot10Module.MetaData.PEImage.ToRVA(methodDefTable.StartOffset));
+				dnlibModule = ModuleDefMD.Load(hInstModule);
+				methodDefTable = dnlibModule.TablesStream.MethodTable;
+				methodDefTablePtr = new IntPtr((byte*)hInstModule + (uint)dnlibModule.MetaData.PEImage.ToRVA(methodDefTable.StartOffset));
 
-				initializeDot10Methods();
+				initializeDNLibMethods();
 			}
 		}
 
@@ -176,8 +176,8 @@ namespace de4dot.mdecrypt {
 			return field.GetValue(obj);
 		}
 
-		unsafe void initializeDot10Methods() {
-			moduleCctor = dot10Module.GlobalType.FindStaticConstructor();
+		unsafe void initializeDNLibMethods() {
+			moduleCctor = dnlibModule.GlobalType.FindStaticConstructor();
 			if (moduleCctor == null)
 				moduleCctorCodeRva = 0;
 			else {
@@ -478,7 +478,7 @@ namespace de4dot.mdecrypt {
 			ctx.dm = new DumpedMethod();
 			ctx.dm.token = token;
 
-			ctx.method = dot10Module.ResolveMethod(MDToken.ToRID(token));
+			ctx.method = dnlibModule.ResolveMethod(MDToken.ToRID(token));
 			if (ctx.method == null)
 				throw new ApplicationException(string.Format("Could not find method {0:X8}", token));
 
diff --git a/de4dot.mdecrypt/de4dot.mdecrypt.csproj b/de4dot.mdecrypt/de4dot.mdecrypt.csproj
index fbaf34a2..0b174366 100644
--- a/de4dot.mdecrypt/de4dot.mdecrypt.csproj
+++ b/de4dot.mdecrypt/de4dot.mdecrypt.csproj
@@ -46,9 +46,9 @@
       <Project>{045B96F2-AF80-4C4C-8D27-E38635AC705E}</Project>
       <Name>blocks</Name>
     </ProjectReference>
-    <ProjectReference Include="..\dot10\src\dot10.csproj">
+    <ProjectReference Include="..\dnlib\src\dnlib.csproj">
       <Project>{FDFC1237-143F-4919-8318-4926901F4639}</Project>
-      <Name>dot10</Name>
+      <Name>dnlib</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/de4dot.sln b/de4dot.sln
index 2d2b433f..20f8952c 100644
--- a/de4dot.sln
+++ b/de4dot.sln
@@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.cui", "de4dot.cui\de
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.mdecrypt", "de4dot.mdecrypt\de4dot.mdecrypt.csproj", "{5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dot10", "dot10\src\dot10.csproj", "{FDFC1237-143F-4919-8318-4926901F4639}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dnlib", "dnlib\src\dnlib.csproj", "{FDFC1237-143F-4919-8318-4926901F4639}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyServer-CLR20", "AssemblyServer-CLR20\AssemblyServer-CLR20.csproj", "{C72DC899-1760-432B-B429-3CD88B669A6A}"
 EndProject
@@ -33,7 +33,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyServer-CLR40", "Ass
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyServer-CLR40-x64", "AssemblyServer-CLR40-x64\AssemblyServer-CLR40-x64.csproj", "{A0F58B9F-BB56-4D9B-B04A-726F9E7961EB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "dot10\Examples\Examples.csproj", "{F27E72B5-C4BD-40BF-AD19-4C8A99B55872}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "dnlib\Examples\Examples.csproj", "{F27E72B5-C4BD-40BF-AD19-4C8A99B55872}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/dnlib b/dnlib
new file mode 160000
index 00000000..d61ffe6a
--- /dev/null
+++ b/dnlib
@@ -0,0 +1 @@
+Subproject commit d61ffe6a15f243df5876d33e87d6fadf28bdcd64
diff --git a/dot10 b/dot10
deleted file mode 160000
index ef5ba010..00000000
--- a/dot10
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ef5ba01006a288eef4739dc7c9b39c24914777e5