diff --git a/src/ThisAssembly.Constants/CSharp.sbntxt b/src/ThisAssembly.Constants/CSharp.sbntxt
index e477a4a3..e0d5f4c1 100644
--- a/src/ThisAssembly.Constants/CSharp.sbntxt
+++ b/src/ThisAssembly.Constants/CSharp.sbntxt
@@ -18,11 +18,11 @@
 	    /// </summary>
 {{ end }}
 {{ func render }}
-    public static partial class {{ $0.Name }}
+    public static partial class {{ $0.Name | string.replace "-" "_" | string.replace " " "_" }}
     {
         {{~ for value in $0.Values ~}}
         {{- summary value ~}}
-	    public const string {{ value.Name }} =  @"{{ value.Value }}";
+	    public const string {{ value.Name | string.replace "-" "_" | string.replace " " "_" }} =  @"{{ value.Value }}";
         {{~ end ~}}
 
         {{ for area in $0.NestedAreas 
diff --git a/src/ThisAssembly.Resources/CSharp.sbntxt b/src/ThisAssembly.Resources/CSharp.sbntxt
index 7494d3ad..88649266 100644
--- a/src/ThisAssembly.Resources/CSharp.sbntxt
+++ b/src/ThisAssembly.Resources/CSharp.sbntxt
@@ -16,7 +16,7 @@
 		/// => @"{{ $0.Path }}"
 		{{~ end ~}}
 		/// </summary>
-		public static partial class {{ $0.Name }}
+		public static partial class {{ $0.Name | string.replace "-" "_" | string.replace " " "_" }}
 		{
 			{{~ if $0.IsText ~}}
 			private static string text;
@@ -31,7 +31,7 @@
 		}
 {{ end }}
 {{ func render }}
-	public static partial class {{ $0.Name }}
+	public static partial class {{ $0.Name | string.replace "-" "_" | string.replace " " "_" }}
 	{
 		{{~ if $0.Resources ~}}
         {{~ for $r in $0.Resources ~}}
diff --git a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
index 219d1eb9..ba067473 100644
--- a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
+++ b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
@@ -35,16 +35,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Resources.resx">
-      <Generator></Generator>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-
+    <EmbeddedResource Update="Resources.resx" Generator="" CopyToOutputDirectory="PreserveNewest" />
     <EmbeddedResource Include="Content/Styles/Custom.css" Kind="Text" Comment="Secondary CSS" />
     <EmbeddedResource Include="Content/Styles/Main.css" Comment="Primary CSS" />
     <EmbeddedResource Include="Content/Docs/*" />
     <EmbeddedResource Include="Content/Swagger/*" />
-    <None Remove="Content/Swagger/*" />
+    <EmbeddedResource Include="webhook-data.json" Kind="text" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/ThisAssembly.Tests/webhook-data.json b/src/ThisAssembly.Tests/webhook-data.json
new file mode 100644
index 00000000..0db3279e
--- /dev/null
+++ b/src/ThisAssembly.Tests/webhook-data.json
@@ -0,0 +1,3 @@
+{
+
+}