diff --git a/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs b/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs
index 033a12dec..6431cadc0 100644
--- a/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs
+++ b/ICSharpCode.Decompiler/TypeSystem/DecompilerTypeSystem.cs
@@ -46,8 +46,8 @@ namespace ICSharpCode.Decompiler
 			if (moduleDefinition == null)
 				throw new ArgumentNullException("moduleDefinition");
 			this.moduleDefinition = moduleDefinition;
-			CecilLoader mainAssemblyCecilLoader = new CecilLoader { IncludeInternalMembers = true, LazyLoad = true, OnEntityLoaded = StoreMemberReference };
-			CecilLoader referencedAssemblyCecilLoader = new CecilLoader { IncludeInternalMembers = true, LazyLoad = true };
+			CecilLoader mainAssemblyCecilLoader = new CecilLoader { IncludeInternalMembers = true, LazyLoad = true, OnEntityLoaded = StoreMemberReference, ShortenInterfaceImplNames = false };
+			CecilLoader referencedAssemblyCecilLoader = new CecilLoader { IncludeInternalMembers = true, LazyLoad = true, ShortenInterfaceImplNames = false };
 			typeReferenceCecilLoader.SetCurrentModule(moduleDefinition);
 			IUnresolvedAssembly mainAssembly = mainAssemblyCecilLoader.LoadModule(moduleDefinition);
 			var referencedAssemblies = new List<IUnresolvedAssembly>();
diff --git a/NRefactory b/NRefactory
index 2a744ce79..2d6d964fc 160000
--- a/NRefactory
+++ b/NRefactory
@@ -1 +1 @@
-Subproject commit 2a744ce793cb8c670f4d6340b74ab95e8dfedcc0
+Subproject commit 2d6d964fcdd8854451779f994bf3271d2896d6be