diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts
index 738ec77..90aff1f 100644
--- a/templates/package-builder/src/build/build.ts
+++ b/templates/package-builder/src/build/build.ts
@@ -128,16 +128,10 @@ function buildDotNetNewNuGetPackage() {
     const sourceProjectName = 'WebApplicationBasic';
     const projectGuid = '00000000-0000-0000-0000-000000000000';
     const filenameReplacements = [
-        // TODO: For dotnetnew templates, switch to csproj. No need for SDK choice as it can be Preview3+ only.
-        { from: /.*\.xproj$/, to: `${sourceProjectName}.xproj` },
+        { from: /.*\.csproj$/, to: `${sourceProjectName}.csproj` },
         { from: /\btemplate_gitignore$/, to: '.gitignore' }
     ];
-    const contentReplacements = [
-        { from: /<ProjectGuid>[0-9a-f\-]{36}<\/ProjectGuid>/g, to: `<ProjectGuid>${projectGuid}</ProjectGuid>` },
-        { from: /<RootNamespace>.*?<\/RootNamespace>/g, to: `<RootNamespace>${sourceProjectName}</RootNamespace>`},
-        { from: /\s*<BaseIntermediateOutputPath.*?<\/BaseIntermediateOutputPath>/g, to: '' },
-        { from: /\s*<OutputPath.*?<\/OutputPath>/g, to: '' },
-    ];
+    const contentReplacements = [];
     _.forEach(templates, (templateConfig, templateName) => {
         const templateOutputDir = path.join(outputRoot, 'Content', templateName);
         writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements, templateConfig.forceInclusion);
@@ -148,14 +142,15 @@ function buildDotNetNewNuGetPackage() {
 
         fs.writeFileSync(path.join(templateConfigDir, 'template.json'), JSON.stringify({
             author: 'Microsoft',
-            classifications: [ 'Standard>>Quick Starts' ],
-            name: `ASP.NET Core SPA with ${templateConfig.displayName}`,
-            groupIdentity: `Microsoft.AspNetCore.Spa.${templateConfig.dotNetNewId}`,
-            identity: `Microsoft.AspNetCore.Spa.${templateConfig.dotNetNewId}`,
-            shortName: `aspnetcorespa-${templateConfig.dotNetNewId.toLowerCase()}`,
-            tags: { language: 'C#' },
-            guids: [ projectGuid ],
-            sourceName: sourceProjectName
+            classifications: ["Web", "MVC", "SPA"],
+            name: `MVC ASP.NET Core with ${templateConfig.displayName}`,
+            groupIdentity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}`,
+            identity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}.CSharp`,
+            shortName: `${templateConfig.dotNetNewId.toLowerCase()}`,
+            tags: { language: 'C#', type: 'project' },
+            sourceName: sourceProjectName,
+            preferNameDirectory: true,
+            symbols: {}
         }, null, 2));
 
         fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({
diff --git a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec
similarity index 92%
rename from templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec
rename to templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec
index f2da06f..a1ac202 100644
--- a/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.Spa.Templates.nuspec
+++ b/templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
-        <id>Microsoft.AspNetCore.Spa.Templates</id>
+        <id>Microsoft.AspNetCore.SpaTemplates</id>
         <version>{version}</version>
         <description>Single Page Application templates for ASP.NET Core</description>
         <authors>Microsoft</authors>