diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj
index 56fdba30..24c853c0 100644
--- a/de4dot.code/de4dot.code.csproj
+++ b/de4dot.code/de4dot.code.csproj
@@ -160,7 +160,7 @@
     <Compile Include="deobfuscators\Eazfuscator_NET\StringDecrypter.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\VersionDetector.cs" />
     <Compile Include="deobfuscators\ExceptionLoggerRemover.cs" />
-    <Compile Include="deobfuscators\ResourceMethodsRestorerBase.cs" />
+    <Compile Include="deobfuscators\MethodCallRestorerBase.cs" />
     <Compile Include="deobfuscators\Goliath_NET\ArrayDecrypter.cs" />
     <Compile Include="deobfuscators\Goliath_NET\ArrayValueInliner.cs" />
     <Compile Include="deobfuscators\Goliath_NET\DecrypterBase.cs" />
diff --git a/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs
index 26d3b14b..c08dcfa2 100644
--- a/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs
+++ b/de4dot.code/deobfuscators/CodeVeil/ResourceDecrypter.cs
@@ -36,7 +36,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
 		MethodDefinition resTypeCtor;
 		TypeDefinition resourceFlagsType;
 		TypeDefinition resourceEnumeratorType;
-		ResourceMethodsRestorerBase resourceMethodsRestorer;
+		MethodCallRestorerBase methodsRestorer;
 
 		public bool CanRemoveTypes {
 			get {
@@ -78,7 +78,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
 		}
 
 		public void initialize() {
-			resourceMethodsRestorer = new ResourceMethodsRestorerBase(module);
+			methodsRestorer = new MethodCallRestorerBase(module);
 			findEncryptedResourceStreamType();
 			findEncryptedResourceSet();
 			findEncryptedResourceReader();
@@ -264,8 +264,8 @@ namespace de4dot.code.deobfuscators.CodeVeil {
 				if (!findManifestResourceStreamMethods(type, out getManifestResourceStreamMethodTmp1, out getManifestResourceStreamMethodTmp2))
 					continue;
 
-				resourceMethodsRestorer.createGetManifestResourceStream1(getManifestResourceStreamMethodTmp1);
-				resourceMethodsRestorer.createGetManifestResourceStream2(getManifestResourceStreamMethodTmp2);
+				methodsRestorer.createGetManifestResourceStream1(getManifestResourceStreamMethodTmp1);
+				methodsRestorer.createGetManifestResourceStream2(getManifestResourceStreamMethodTmp2);
 				encryptedResourceStreamType = type;
 				return;
 			}
@@ -355,7 +355,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
 			if (encryptedResourceStreamType == null)
 				return;
 
-			resourceMethodsRestorer.deobfuscate(blocks);
+			methodsRestorer.deobfuscate(blocks);
 		}
 	}
 }
diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs
index ac20b5d8..12377401 100644
--- a/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs
+++ b/de4dot.code/deobfuscators/Eazfuscator_NET/ResourceMethodsRestorer.cs
@@ -21,7 +21,7 @@ using Mono.Cecil;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators.Eazfuscator_NET {
-	class ResourceMethodsRestorer : ResourceMethodsRestorerBase {
+	class ResourceMethodsRestorer : MethodCallRestorerBase {
 		TypeDefinition getManifestResourceStreamType;
 		EmbeddedResource getManifestResourceStreamTypeResource;
 
diff --git a/de4dot.code/deobfuscators/ResourceMethodsRestorerBase.cs b/de4dot.code/deobfuscators/MethodCallRestorerBase.cs
similarity index 97%
rename from de4dot.code/deobfuscators/ResourceMethodsRestorerBase.cs
rename to de4dot.code/deobfuscators/MethodCallRestorerBase.cs
index 868c38e3..1ff31959 100644
--- a/de4dot.code/deobfuscators/ResourceMethodsRestorerBase.cs
+++ b/de4dot.code/deobfuscators/MethodCallRestorerBase.cs
@@ -23,7 +23,7 @@ using Mono.Cecil.Cil;
 using de4dot.blocks;
 
 namespace de4dot.code.deobfuscators {
-	class ResourceMethodsRestorerBase {
+	class MethodCallRestorerBase {
 		protected MemberReferenceBuilder builder;
 		protected ModuleDefinition module;
 
@@ -39,7 +39,7 @@ namespace de4dot.code.deobfuscators {
 
 		MethodDefinitionAndDeclaringTypeDict<NewMethodInfo> oldToNewMethod = new MethodDefinitionAndDeclaringTypeDict<NewMethodInfo>();
 
-		public ResourceMethodsRestorerBase(ModuleDefinition module) {
+		public MethodCallRestorerBase(ModuleDefinition module) {
 			this.module = module;
 			this.builder = new MemberReferenceBuilder(module);
 		}