diff --git a/14-validation/Pages/Error.cshtml.cs b/14-validation/Pages/Error.cshtml.cs
index 3c4d98c..4fa4447 100644
--- a/14-validation/Pages/Error.cshtml.cs
+++ b/14-validation/Pages/Error.cshtml.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace _16_validation.Pages;
+namespace Validation.Pages;
 
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 [IgnoreAntiforgeryToken]
diff --git a/14-validation/Pages/Index.cshtml.cs b/14-validation/Pages/Index.cshtml.cs
index 4e8a8cc..6c24cf9 100644
--- a/14-validation/Pages/Index.cshtml.cs
+++ b/14-validation/Pages/Index.cshtml.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace _16_validation.Pages;
+namespace Validation.Pages;
 
 public class IndexModel : PageModel
 {
diff --git a/14-validation/Pages/Privacy.cshtml.cs b/14-validation/Pages/Privacy.cshtml.cs
index 19cce5f..32f62a5 100644
--- a/14-validation/Pages/Privacy.cshtml.cs
+++ b/14-validation/Pages/Privacy.cshtml.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace _16_validation.Pages;
+namespace Validation.Pages;
 
 public class PrivacyModel : PageModel
 {
diff --git a/14-validation/Pages/Shared/_Layout.cshtml b/14-validation/Pages/Shared/_Layout.cshtml
index 11d4adf..e873001 100644
--- a/14-validation/Pages/Shared/_Layout.cshtml
+++ b/14-validation/Pages/Shared/_Layout.cshtml
@@ -3,16 +3,16 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - _16_validation</title>
+    <title>@ViewData["Title"] - Validation</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/_16_validation.styles.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/Validation.styles.css" asp-append-version="true" />
 </head>
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index">_16_validation</a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index">Validation</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -38,7 +38,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2022 - _16_validation - <a asp-area="" asp-page="/Privacy">Privacy</a>
+            &copy; 2022 - Validation - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
     </footer>
 
diff --git a/14-validation/Pages/_ViewImports.cshtml b/14-validation/Pages/_ViewImports.cshtml
index b3e9702..3cd703e 100644
--- a/14-validation/Pages/_ViewImports.cshtml
+++ b/14-validation/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-﻿@using _16_validation
-@namespace _16_validation.Pages
+﻿@using Validation
+@namespace Validation.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/14-validation/Properties/launchSettings.json b/14-validation/Properties/launchSettings.json
index f375c59..5525429 100644
--- a/14-validation/Properties/launchSettings.json
+++ b/14-validation/Properties/launchSettings.json
@@ -8,7 +8,7 @@
     }
   },
   "profiles": {
-    "_16_validation": {
+    "Validation": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
diff --git a/14-validation/Validation.csproj b/14-validation/Validation.csproj
index 550bc53..7707fd5 100644
--- a/14-validation/Validation.csproj
+++ b/14-validation/Validation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>_16_validation</RootNamespace>
+    <RootNamespace>Validation</RootNamespace>
   </PropertyGroup>
 
 </Project>
diff --git a/14-validation/WebHookSettings.cs b/14-validation/WebHookSettings.cs
index 4efb6ac..3ec24a4 100644
--- a/14-validation/WebHookSettings.cs
+++ b/14-validation/WebHookSettings.cs
@@ -1,13 +1,16 @@
 using System.ComponentModel.DataAnnotations;
+using System.Text.RegularExpressions;
 
 public class WebHookSettings
 {
     public const string ConfigurationSectionName = "WebHook";
-   
+
     [Required, Url]
     public string WebhookUrl { get; set; } = string.Empty;
 
     [Required]
+    [RegularExpression(@"^[a-zA-Z''-'\s]{1,20}$",
+        ErrorMessage = "DisplayName: {0} doesn't match RegEx")]
     public string DisplayName { get; set; } = string.Empty;
 
     public bool Enabled { get; set; }
diff --git a/15-postconfig-validation/Pages/Error.cshtml.cs b/15-postconfig-validation/Pages/Error.cshtml.cs
index 8c0c108..4fa4447 100644
--- a/15-postconfig-validation/Pages/Error.cshtml.cs
+++ b/15-postconfig-validation/Pages/Error.cshtml.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace _17_validation.Pages;
+namespace Validation.Pages;
 
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 [IgnoreAntiforgeryToken]
diff --git a/15-postconfig-validation/Pages/Index.cshtml.cs b/15-postconfig-validation/Pages/Index.cshtml.cs
index a8f4881..6c24cf9 100644
--- a/15-postconfig-validation/Pages/Index.cshtml.cs
+++ b/15-postconfig-validation/Pages/Index.cshtml.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace _17_validation.Pages;
+namespace Validation.Pages;
 
 public class IndexModel : PageModel
 {
diff --git a/15-postconfig-validation/Pages/Privacy.cshtml.cs b/15-postconfig-validation/Pages/Privacy.cshtml.cs
index a535c19..32f62a5 100644
--- a/15-postconfig-validation/Pages/Privacy.cshtml.cs
+++ b/15-postconfig-validation/Pages/Privacy.cshtml.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace _17_validation.Pages;
+namespace Validation.Pages;
 
 public class PrivacyModel : PageModel
 {
diff --git a/15-postconfig-validation/Pages/Shared/_Layout.cshtml b/15-postconfig-validation/Pages/Shared/_Layout.cshtml
index 55a5898..e873001 100644
--- a/15-postconfig-validation/Pages/Shared/_Layout.cshtml
+++ b/15-postconfig-validation/Pages/Shared/_Layout.cshtml
@@ -3,16 +3,16 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - _17_validation</title>
+    <title>@ViewData["Title"] - Validation</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/_17_validation.styles.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/Validation.styles.css" asp-append-version="true" />
 </head>
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
-                <a class="navbar-brand" asp-area="" asp-page="/Index">_17_validation</a>
+                <a class="navbar-brand" asp-area="" asp-page="/Index">Validation</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -38,7 +38,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2022 - _17_validation - <a asp-area="" asp-page="/Privacy">Privacy</a>
+            &copy; 2022 - Validation - <a asp-area="" asp-page="/Privacy">Privacy</a>
         </div>
     </footer>
 
diff --git a/15-postconfig-validation/Pages/_ViewImports.cshtml b/15-postconfig-validation/Pages/_ViewImports.cshtml
index 6f70b4e..3cd703e 100644
--- a/15-postconfig-validation/Pages/_ViewImports.cshtml
+++ b/15-postconfig-validation/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-﻿@using _17_validation
-@namespace _17_validation.Pages
+﻿@using Validation
+@namespace Validation.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/15-postconfig-validation/Properties/launchSettings.json b/15-postconfig-validation/Properties/launchSettings.json
index 5322037..5525429 100644
--- a/15-postconfig-validation/Properties/launchSettings.json
+++ b/15-postconfig-validation/Properties/launchSettings.json
@@ -8,7 +8,7 @@
     }
   },
   "profiles": {
-    "_17_validation": {
+    "Validation": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
diff --git a/15-postconfig-validation/Validation.csproj b/15-postconfig-validation/Validation.csproj
index 7b0ab12..7707fd5 100644
--- a/15-postconfig-validation/Validation.csproj
+++ b/15-postconfig-validation/Validation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>_17_validation</RootNamespace>
+    <RootNamespace>Validation</RootNamespace>
   </PropertyGroup>
 
 </Project>
