diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
index 560c723a4a..0beb8d9955 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
+++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
@@ -31,14 +31,14 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
         /// <summary>
         /// Creates a <see cref="TagHelperDescriptor"/> from the given <paramref name="type"/>.
         /// </summary>
+        /// <param name="assemblyName">The assembly name that contains <paramref name="type"/>.</param>
         /// <param name="type">The type to create a <see cref="TagHelperDescriptor"/> from.</param>
         /// <returns>A <see cref="TagHelperDescriptor"/> that describes the given <paramref name="type"/>.</returns>
-        public static IEnumerable<TagHelperDescriptor> CreateDescriptors(Type type)
+        public static IEnumerable<TagHelperDescriptor> CreateDescriptors(string assemblyName, Type type)
         {
             var tagNames = GetTagNames(type);
             var typeName = type.FullName;
             var attributeDescriptors = GetAttributeDescriptors(type);
-            var assemblyName = type.GetTypeInfo().Assembly.GetName().Name;
 
             return tagNames.Select(tagName =>
                 new TagHelperDescriptor(tagName,
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs
index 8ddacf76cc..b053673d4a 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs
@@ -26,18 +26,23 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 
         private readonly TagHelperTypeResolver _typeResolver;
 
-        // internal for testing
-        internal TagHelperDescriptorResolver(TagHelperTypeResolver typeResolver)
-        {
-            _typeResolver = typeResolver;
-        }
-
         /// <summary>
         /// Instantiates a new instance of the <see cref="TagHelperDescriptorResolver"/> class.
         /// </summary>
         public TagHelperDescriptorResolver()
             : this(new TagHelperTypeResolver())
         {
+
+        }
+
+        /// <summary>
+        /// Instantiates a new instance of <see cref="TagHelperDescriptorResolver"/> class with the
+        /// specified <paramref name="typeResolver"/>.
+        /// </summary>
+        /// <param name="typeResolver">The <see cref="TagHelperTypeResolver"/>.</param>
+        public TagHelperDescriptorResolver(TagHelperTypeResolver typeResolver)
+        {
+            _typeResolver = typeResolver;
         }
 
         /// <inheritdoc />
@@ -112,7 +117,8 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
             var tagHelperTypes = _typeResolver.Resolve(assemblyName, documentLocation, errorSink);
 
             // Convert types to TagHelperDescriptors
-            var descriptors = tagHelperTypes.SelectMany(TagHelperDescriptorFactory.CreateDescriptors);
+            var descriptors = tagHelperTypes.SelectMany(
+                type => TagHelperDescriptorFactory.CreateDescriptors(assemblyName, type));
 
             return descriptors;
         }
diff --git a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs b/src/Microsoft.AspNet.Razor/RazorEngineHost.cs
index ba5b501398..f73336cecc 100644
--- a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs
+++ b/src/Microsoft.AspNet.Razor/RazorEngineHost.cs
@@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Razor
         /// <summary>
         /// The <see cref="ITagHelperDescriptorResolver"/> used to resolve <see cref="TagHelperDescriptor"/>s.
         /// </summary>
-        public virtual ITagHelperDescriptorResolver TagHelperDescriptorResolver { get; protected set; }
+        public virtual ITagHelperDescriptorResolver TagHelperDescriptorResolver { get; set; }
 
         /// <summary>
         /// Boolean indicating if instrumentation code should be injected into the output page