diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
index 02fbb9fa67..e571678cf9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
@@ -191,6 +191,10 @@ namespace ICSharpCode.NRefactory.TypeSystem
 				get { return moduleAttributes; }
 			}
 			
+			public string AssemblyName {
+				get { return assemblyName; }
+			}
+			
 			public override string ToString()
 			{
 				return "[CecilProjectContent " + assemblyName + "]";
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
index 515d85876f..e2d6ea5a56 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
@@ -30,6 +30,11 @@ namespace ICSharpCode.NRefactory.TypeSystem
 	#endif
 	public interface IProjectContent : ITypeResolveContext, IAnnotatable
 	{
+		/// <summary>
+		/// Gets the assembly name (short name).
+		/// </summary>
+		string AssemblyName { get; }
+		
 		/// <summary>
 		/// Gets the list of all assembly attributes in the project.
 		/// </summary>
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/MinimalResolveContext.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/MinimalResolveContext.cs
index eb0af6e4b4..880f81274c 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/MinimalResolveContext.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/MinimalResolveContext.cs
@@ -153,5 +153,9 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		{
 			throw new NotSupportedException();
 		}
+		
+		public string AssemblyName {
+			get { return "MinimalResolveContext"; }
+		}
 	}
 }
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
index e288260245..2fbba2da07 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
@@ -40,6 +40,10 @@ namespace ICSharpCode.NRefactory.TypeSystem.Implementation
 		readonly ReaderWriterLockSlim readerWriterLock = new ReaderWriterLockSlim();
 		readonly Dictionary<string, IParsedFile> fileDict = new Dictionary<string, IParsedFile>(Platform.FileNameComparer);
 		
+		public virtual string AssemblyName {
+			get { return string.Empty; }
+		}
+		
 		#region AssemblyAttributes
 		readonly List<IAttribute> assemblyAttributes = new List<IAttribute>(); // mutable assembly attribute storage
 		readonly List<IAttribute> moduleAttributes = new List<IAttribute>();