diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
index 1b156343c..168cb1a39 100644
--- a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
+++ b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
@@ -61,11 +61,11 @@ namespace Orchard.Tests.Environment.Extensions {
                 throw new NotImplementedException();
             }
 
-            public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
+            public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
                 throw new NotImplementedException();
             }
 
-            public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
+            public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
                 throw new NotImplementedException();
             }
 
@@ -73,7 +73,7 @@ namespace Orchard.Tests.Environment.Extensions {
                 return new ExtensionProbeEntry { Descriptor = descriptor, Loader = this };
             }
 
-            public IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
+            public IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
                 throw new NotImplementedException();
             }
 
diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
index c112257fe..46bd59bc8 100644
--- a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
+++ b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
@@ -60,11 +60,11 @@ namespace Orchard.Tests.Environment.Extensions {
                 throw new NotImplementedException();
             }
 
-            public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
+            public void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
                 throw new NotImplementedException();
             }
 
-            public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
+            public void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
                 throw new NotImplementedException();
             }
 
@@ -72,7 +72,7 @@ namespace Orchard.Tests.Environment.Extensions {
                 return new ExtensionProbeEntry { Descriptor = descriptor, Loader = this };
             }
 
-            public IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
+            public IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor) {
                 throw new NotImplementedException();
             }
 
diff --git a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
index 332465f21..11dbb4fa3 100644
--- a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
+++ b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
@@ -159,7 +159,7 @@ namespace Orchard.Environment.Extensions {
 
             var referenceNames = (context.ReferencesByModule.ContainsKey(activatedExtension.Descriptor.Name) ?
                 context.ReferencesByModule[activatedExtension.Descriptor.Name] :
-                Enumerable.Empty<ExtensionReferenceEntry>())
+                Enumerable.Empty<ExtensionReferenceProbeEntry>())
                 .Select(r => r.Name)
                 .Distinct(StringComparer.OrdinalIgnoreCase);
 
@@ -184,7 +184,7 @@ namespace Orchard.Environment.Extensions {
 
             var references = context.ReferencesByName.ContainsKey(referenceName) ?
                 context.ReferencesByName[referenceName] :
-                Enumerable.Empty<ExtensionReferenceEntry>();
+                Enumerable.Empty<ExtensionReferenceProbeEntry>();
 
             // Binary references
             var bestBinaryReference = references
diff --git a/src/Orchard/Environment/Extensions/ExtensionLoadingContext.cs b/src/Orchard/Environment/Extensions/ExtensionLoadingContext.cs
index 1b80b0746..7988757ae 100644
--- a/src/Orchard/Environment/Extensions/ExtensionLoadingContext.cs
+++ b/src/Orchard/Environment/Extensions/ExtensionLoadingContext.cs
@@ -51,11 +51,11 @@ namespace Orchard.Environment.Extensions {
         /// <summary>
         /// For every reference name, list of potential loaders/locations
         /// </summary>
-        public IDictionary<string, IEnumerable<ExtensionReferenceEntry>> ReferencesByModule { get; set; }
+        public IDictionary<string, IEnumerable<ExtensionReferenceProbeEntry>> ReferencesByModule { get; set; }
 
         /// <summary>
-        /// For every extension name, list of references
+        /// For every extension name, list of potential loaders/locations
         /// </summary>
-        public IDictionary<string, IEnumerable<ExtensionReferenceEntry>> ReferencesByName { get; set; }
+        public IDictionary<string, IEnumerable<ExtensionReferenceProbeEntry>> ReferencesByName { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
index e6514b195..bf4c1d4f7 100644
--- a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
+++ b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
@@ -79,15 +79,15 @@ namespace Orchard.Environment.Extensions.Loaders {
             }
         }
 
-        public override IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor descriptor) {
+        public override IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor descriptor) {
             string projectPath = GetProjectPath(descriptor);
             if (projectPath == null)
-                return Enumerable.Empty<ExtensionReferenceEntry>();
+                return Enumerable.Empty<ExtensionReferenceProbeEntry>();
 
             using(var stream = _virtualPathProvider.OpenFile(projectPath)) {
                 var projectFile = _projectFileParser.Parse(stream);
 
-                return projectFile.References.Select(r => new ExtensionReferenceEntry {
+                return projectFile.References.Select(r => new ExtensionReferenceProbeEntry {
                     Descriptor = descriptor,
                     Loader = this,
                     Name = r.AssemblyName,
diff --git a/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs b/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs
index 632a80695..09192bd06 100644
--- a/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs
+++ b/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs
@@ -17,8 +17,8 @@ namespace Orchard.Environment.Extensions.Loaders {
         public abstract int Order { get; }
         public string Name { get { return this.GetType().Name; } }
 
-        public virtual IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor descriptor) {
-            return Enumerable.Empty<ExtensionReferenceEntry>();
+        public virtual IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor descriptor) {
+            return Enumerable.Empty<ExtensionReferenceProbeEntry>();
         }
 
         public virtual Assembly LoadReference(DependencyReferenceDescriptor reference) {
@@ -35,8 +35,8 @@ namespace Orchard.Environment.Extensions.Loaders {
             return null;
         }
 
-        public virtual void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) { }
-        public virtual void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) { }
+        public virtual void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) { }
+        public virtual void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) { }
 
         public virtual void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { }
         public virtual void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { }
diff --git a/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs
index b26a26278..6f6203398 100644
--- a/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs
+++ b/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs
@@ -13,7 +13,7 @@ namespace Orchard.Environment.Extensions.Loaders {
         public DateTime LastModificationTimeUtc { get; set; }
     }
 
-    public class ExtensionReferenceEntry {
+    public class ExtensionReferenceProbeEntry {
         public ExtensionDescriptor Descriptor { get; set; }
         public IExtensionLoader Loader { get; set; }
         public string Name { get; set; }
@@ -24,10 +24,10 @@ namespace Orchard.Environment.Extensions.Loaders {
         int Order { get; }
         string Name { get; }
 
-        IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor);
+        IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor extensionDescriptor);
         Assembly LoadReference(DependencyReferenceDescriptor reference);
-        void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry);
-        void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry);
+        void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry);
+        void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry);
 
         ExtensionProbeEntry Probe(ExtensionDescriptor descriptor);
         ExtensionEntry Load(ExtensionDescriptor descriptor);
diff --git a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs
index 779edfca2..315cf5680 100644
--- a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs
+++ b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs
@@ -95,7 +95,7 @@ namespace Orchard.Environment.Extensions.Loaders {
             }
         }
 
-        public override void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry) {
+        public override void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceProbeEntry referenceEntry) {
             if (string.IsNullOrEmpty(referenceEntry.VirtualPath))
                 return;
 
@@ -125,16 +125,16 @@ namespace Orchard.Environment.Extensions.Loaders {
             }
         }
 
-        public override IEnumerable<ExtensionReferenceEntry> ProbeReferences(ExtensionDescriptor descriptor) {
+        public override IEnumerable<ExtensionReferenceProbeEntry> ProbeReferences(ExtensionDescriptor descriptor) {
             var assemblyPath = GetAssemblyPath(descriptor);
             if (assemblyPath == null)
-                return Enumerable.Empty<ExtensionReferenceEntry>();
+                return Enumerable.Empty<ExtensionReferenceProbeEntry>();
 
             return _virtualPathProvider
                 .ListFiles(_virtualPathProvider.GetDirectoryName(assemblyPath))
                 .Where(s => StringComparer.OrdinalIgnoreCase.Equals(Path.GetExtension(s), ".dll"))
                 .Where(s => !StringComparer.OrdinalIgnoreCase.Equals(Path.GetFileNameWithoutExtension(s), descriptor.Name))
-                .Select(path => new ExtensionReferenceEntry {
+                .Select(path => new ExtensionReferenceProbeEntry {
                     Descriptor = descriptor,
                     Loader = this,
                     Name = Path.GetFileNameWithoutExtension(path),