diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperDescriptorFactory.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperDescriptorFactory.cs
index a3f5f2fcc0..3b75645df0 100644
--- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperDescriptorFactory.cs
+++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperDescriptorFactory.cs
@@ -62,7 +62,6 @@ namespace Microsoft.CodeAnalysis.Razor
 
         /// <inheritdoc />
         public virtual IEnumerable<TagHelperDescriptor> CreateDescriptors(
-            string assemblyName,
             INamedTypeSymbol type,
             ErrorSink errorSink)
         {
@@ -88,7 +87,7 @@ namespace Microsoft.CodeAnalysis.Razor
             var tagHelperDescriptors =
                 BuildTagHelperDescriptors(
                     type,
-                    assemblyName,
+                    type.ContainingAssembly.Identity.Name,
                     attributeDescriptors,
                     targetElementAttributes,
                     allowedChildren);
diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs
index f68e1e4fa1..642b287881 100644
--- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs
+++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs
@@ -45,7 +45,8 @@ namespace Microsoft.CodeAnalysis.Razor
 
             foreach (var type in types)
             {
-                results.AddRange(factory.CreateDescriptors(type.ContainingAssembly.Identity.GetDisplayName(), type, errors));
+                var descriptors = factory.CreateDescriptors(type, errors);
+                results.AddRange(descriptors);
             }
 
             return results;
diff --git a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultTagHelperDescriptorFactoryTest.cs b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultTagHelperDescriptorFactoryTest.cs
index 1af795fd37..d91399bee4 100644
--- a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultTagHelperDescriptorFactoryTest.cs
+++ b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/DefaultTagHelperDescriptorFactoryTest.cs
@@ -245,10 +245,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -335,10 +332,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -420,10 +414,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -510,10 +501,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -747,10 +735,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1015,10 +1000,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1065,10 +1047,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1103,10 +1082,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(OverriddenAttributeTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1138,10 +1114,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedOverriddenAttributeTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1173,10 +1146,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedNotOverriddenAttributeTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
             // Assert
             Assert.Empty(errorSink.Errors);
             Assert.Equal(expectedDescriptors, descriptors, CaseSensitiveTagHelperDescriptorComparer.Default);
@@ -1204,10 +1174,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedSingleAttributeTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1233,10 +1200,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(SingleAttributeTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: new ErrorSink());
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1263,10 +1227,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(MissingAccessorTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1293,10 +1254,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(NonPublicAccessorTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1326,9 +1284,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(NotBoundAttributeTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
+            var descriptors = factory.CreateDescriptors(typeSymbol,
                 errorSink: errorSink);
 
             // Assert
@@ -1346,10 +1302,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(DuplicateAttributeNameTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(descriptors);
@@ -1396,10 +1349,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(MultiTagTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1429,10 +1379,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(InheritedMultiTagTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1460,10 +1407,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(DuplicateTagNameTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1491,10 +1435,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(OverrideNameTagHelper).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -1666,10 +1607,7 @@ public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelpe
             var typeSymbol = Compilation.GetTypeByMetadataName(type.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             var actualErrors = errorSink.Errors.ToArray();
@@ -2167,10 +2105,7 @@ public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelpe
             var typeSymbol = Compilation.GetTypeByMetadataName(typeof(object).FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                objectAssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -2191,10 +2126,7 @@ public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelpe
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             var errors = errorSink.Errors.ToArray();
@@ -2337,10 +2269,7 @@ public class DynamicTestTagHelper : {typeof(AspNetCore.Razor.TagHelpers.TagHelpe
             var typeSymbol = Compilation.GetTypeByMetadataName(tagHelperType.FullName);
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -2381,10 +2310,7 @@ public class DocumentedTagHelper : " + typeof(AspNetCore.Razor.TagHelpers.TagHel
             };
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
@@ -2441,10 +2367,7 @@ public class DocumentedTagHelper : " + typeof(AspNetCore.Razor.TagHelpers.TagHel
             };
 
             // Act
-            var descriptors = factory.CreateDescriptors(
-                AssemblyName,
-                typeSymbol,
-                errorSink: errorSink);
+            var descriptors = factory.CreateDescriptors(typeSymbol, errorSink);
 
             // Assert
             Assert.Empty(errorSink.Errors);
diff --git a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
index 07cd715c21..58badfe615 100644
--- a/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
+++ b/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>