diff --git a/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs b/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
index 341d636d2929..e633bbee56e5 100644
--- a/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
+++ b/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
@@ -191,10 +191,15 @@ public void AllCommonProjectsCreate_NoRestore(string expectedTemplateName, strin
         [InlineData("dotnet gitignore file", "gitignore")]
         [InlineData("global.json file", "globaljson")]
         [InlineData("NuGet Config", "nugetconfig")]
+        [InlineData("dotnet gitignore file", "git.ignore")]
+        [InlineData("global.json file", "global.json")]
+        [InlineData("NuGet Config", "nuget.config")]
         [InlineData("Solution File", "sln")]
         [InlineData("Solution File", "solution")]
         [InlineData("Dotnet local tool manifest file", "tool-manifest")]
         [InlineData("Web Config", "webconfig")]
+        [InlineData("EditorConfig file", "editorconfig")]
+        [InlineData("EditorConfig file", ".editorconfig")]
         public void AllCommonItemsCreate(string expectedTemplateName, string templateShortName)
         {
             string workingDir = TestUtils.CreateTemporaryFolder();
diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/EditorConfig/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/EditorConfig/.template.config/template.json
index b11931414cd5..012ac7162cdb 100644
--- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/EditorConfig/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/EditorConfig/.template.config/template.json
@@ -23,7 +23,7 @@
     }
   ],
   "identity": "Microsoft.Standard.QuickStarts.EditorConfigFile",
-  "shortName": "editorconfig",
+  "shortName": [ "editorconfig", ".editorconfig" ],
   "symbols": {
     "Empty": {
       "type": "parameter",
diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Gitignore/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Gitignore/.template.config/template.json
index 1d88865dc090..739230f294e1 100644
--- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Gitignore/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Gitignore/.template.config/template.json
@@ -13,7 +13,7 @@
   "groupIdentity": "GitignoreFile",
   "precedence": "100",
   "identity": "Microsoft.Standard.QuickStarts.GitignoreFile",
-  "shortName": "gitignore",
+  "shortName": [ "gitignore", ".gitignore" ],
   "primaryOutputs": [
     {
       "path": ".gitignore"
diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json
index 8f94ccf15a7d..ce8bea43c8fb 100644
--- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/GlobalJson/.template.config/template.json
@@ -13,7 +13,7 @@
   "groupIdentity": "GlobalJsonFile",
   "precedence": "100",
   "identity": "Microsoft.Standard.QuickStarts.GlobalJsonFile",
-  "shortName": "globaljson",
+  "shortName": [ "globaljson", "global.json" ],
   "sourceName": "unused",
   "primaryOutputs": [
     {
diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Nuget/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Nuget/.template.config/template.json
index d525790e49b3..a07f101050c9 100644
--- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Nuget/.template.config/template.json
+++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Nuget/.template.config/template.json
@@ -13,7 +13,7 @@
   "groupIdentity": "ItemNugetConfig",
   "precedence": "100",
   "identity": "Microsoft.Standard.QuickStarts.Nuget.Config",
-  "shortName": "nugetconfig",
+  "shortName": [ "nugetconfig", "nuget.config" ],
   "primaryOutputs": [
     {
       "path": "nuget.config"