diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
index bd66729778..2a9f95d7e4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets
@@ -59,8 +59,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target 
     Name="RazorGenerateDesignTime" 
-    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths;ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
-    Returns="@(RazorGenerateWithTargetPath);@(RazorComponentWithTargetPath)">
+    DependsOnTargets="ResolveRazorGenerateInputs;AssignRazorGenerateTargetPaths" 
+    Returns="@(RazorGenerateWithTargetPath)">
+  </Target>
+
+  <Target 
+    Name="RazorGenerateComponentDesignTime" 
+    DependsOnTargets="ResolveRazorComponentInputs;AssignRazorComponentTargetPaths" 
+    Returns="@(RazorComponentWithTargetPath)">
   </Target>
 
 </Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
index 14a479afe3..668c85bd59 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Rules/RazorComponentWithTargetPath.xaml
@@ -2,14 +2,14 @@
 <Rule
   Description="Razor Document Properties"
   DisplayName="Razor Document Properties"
-  Name="RazorGenerateWithTargetPath"
+  Name="RazorComponentWithTargetPath"
   PageTemplate="generic"
   xmlns="http://schemas.microsoft.com/build/2009/properties">
   <Rule.DataSource>
     <DataSource
       Persistence="ProjectFile"
       ItemType="RazorComponentWithTargetPath"
-      MSBuildTarget="RazorGenerateDesignTime"
+      MSBuildTarget="RazorGenerateComponentDesignTime"
       HasConfigurationCondition="False"
       SourceOfDefaultValue="AfterContext"
       SourceType="TargetResults" />
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
index 7d5f88d9fb..c6b33539ad 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/DesignTimeBuildIntegrationTest.cs
@@ -67,11 +67,11 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("ComponentLibrary")]
-        public async Task RazorGenerateDesignTime_ReturnsRazorComponentWithTargetPath()
+        public async Task RazorGenerateComponentDesignTime_ReturnsRazorComponentWithTargetPath()
         {
             TargetFramework = "netstandard2.0";
 
-            var result = await DotnetMSBuild("RazorGenerateDesignTime;_IntrospectRazorComponentWithTargetPath");
+            var result = await DotnetMSBuild("RazorGenerateComponentDesignTime;_IntrospectRazorComponentWithTargetPath");
 
             Assert.BuildPassed(result);
 
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index f3ad8532a3..631a4c0a46 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -42,6 +42,10 @@
       <RazorGenerate Remove="@(RazorGenerate)" />
     </ItemGroup>
   </Target>
+
+  <ItemGroup>
+    <ProjectCapability Include="DotNetCoreRazorConfiguration" />
+  </ItemGroup>
   <!--
     END COMPONENT .cshtml WORKAROUND
   -->