diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
index c3a65763..bd29e7ca 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -43,7 +43,7 @@
                     <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
                     @foreach (Template template in _templates)
                     {
-                        <option value="@template.Name">@template.Name</option>
+                        <option value="@template.Name">@template.Title</option>
                     }
                 </select>
             </td>
@@ -170,7 +170,7 @@ else
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
index a194a017..98324f3a 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor
@@ -43,7 +43,7 @@
                     <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
                     @foreach (Template template in _templates)
                     {
-                        <option value="@template.Name">@template.Name</option>
+                        <option value="@template.Name">@template.Title</option>
                     }
                 </select>
             </td>
@@ -133,7 +133,7 @@
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
diff --git a/Oqtane.Client/Modules/Admin/Themes/Create.razor b/Oqtane.Client/Modules/Admin/Themes/Create.razor
index c53e79aa..491bf746 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Create.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Create.razor
@@ -36,7 +36,7 @@
                     <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
                     @foreach (Template template in _templates)
                     {
-                        <option value="@template.Name">@template.Name</option>
+                        <option value="@template.Name">@template.Title</option>
                     }
                 </select>
             </td>
@@ -125,7 +125,7 @@
     private bool IsValid(string name)
     {
         // must contain letters, underscores and digits and first character must be letter or underscore
-        return !string.IsNullOrEmpty(name) && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "theme" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index cd363081..cd6d1cd7 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -169,9 +169,12 @@ namespace Oqtane.Controllers
             string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Modules", "Templates", Path.DirectorySeparatorChar.ToString());
             foreach (string directory in Directory.GetDirectories(templatePath))
             {
+                string name = directory.Replace(templatePath, "");
                 if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
                 {
                     var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
+                    template.Name = name;
+                    template.Location = "";
                     if (template.Type.ToLower() != "internal")
                     {
                         template.Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString());
@@ -180,7 +183,7 @@ namespace Oqtane.Controllers
                 }
                 else
                 {
-                    templates.Add(new Template { Name = directory.Replace(templatePath, ""), Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
+                    templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                 }
             }
             return templates;
diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs
index 3ceb6a8f..7c05b0ba 100644
--- a/Oqtane.Server/Controllers/ThemeController.cs
+++ b/Oqtane.Server/Controllers/ThemeController.cs
@@ -96,9 +96,12 @@ namespace Oqtane.Controllers
             string templatePath = Utilities.PathCombine(_environment.WebRootPath, "Themes", "Templates", Path.DirectorySeparatorChar.ToString());
             foreach (string directory in Directory.GetDirectories(templatePath))
             {
+                string name = directory.Replace(templatePath, "");
                 if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
                 {
                     var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
+                    template.Name = name;
+                    template.Location = "";
                     if (template.Type.ToLower() != "internal")
                     {
                         template.Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString());
@@ -107,7 +110,7 @@ namespace Oqtane.Controllers
                 }
                 else
                 {
-                    templates.Add(new Template { Name = directory.Replace(templatePath, ""), Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
+                    templates.Add(new Template { Name = name, Title = name, Type = "External", Version = "", Location = Utilities.PathCombine(root.Parent.ToString(), Path.DirectorySeparatorChar.ToString()) });
                 }
             }
             return templates;
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json b/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
index df2b9b40..9dbe84ca 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/template.json
@@ -1,5 +1,5 @@
 {
-  "Name": "Default Module Template",
+  "Title": "Default Module Template",
   "Type": "External",
   "Version": "2.1.0"
 }
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json b/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
index 0546b83f..560c8e51 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/template.json
@@ -1,5 +1,5 @@
 {
-  "Name": "Default Theme Template",
+  "Title": "Default Theme Template",
   "Type": "External",
   "Version": "2.1.0"
 }
diff --git a/Oqtane.Shared/Models/Template.cs b/Oqtane.Shared/Models/Template.cs
index 60721b28..12859fff 100644
--- a/Oqtane.Shared/Models/Template.cs
+++ b/Oqtane.Shared/Models/Template.cs
@@ -6,10 +6,15 @@ namespace Oqtane.Models
     public class Template
     {
         /// <summary>
-        /// name of template
+        /// name of template (folder name)
         /// </summary>
         public string Name { get; set; }
 
+        /// <summary>
+        /// title of template
+        /// </summary>
+        public string Title { get; set; }
+
         /// <summary>
         /// type of template - Internal / External
         /// </summary>