diff --git a/.github/workflows/cd-nuget.yml b/.github/workflows/cd-nuget.yml
index 136c732..dea3501 100644
--- a/.github/workflows/cd-nuget.yml
+++ b/.github/workflows/cd-nuget.yml
@@ -1,4 +1,4 @@
-on: { push: { tags: ["*"] } }
+on: { push: { tags: ["v[0-9]+.[0-9]+.[0-9]+*"] } }
     
 jobs:
   publish:
@@ -6,6 +6,5 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v3
-      - run: dotnet pack -c:Release -p:Version=${{ github.ref_name }} -p:RepositoryCommit=${{ github.sha }}
-      - env: { NUGET_API_KEY: "${{ secrets.NUGET_API_KEY }}" }
-        run: dotnet nuget push ./src/TypedRoutes/bin/Release/PodNet.Blazor.TypedRoutes.*.nupkg -k $NUGET_API_KEY -s https://api.nuget.org/v3/index.json
+      - run: dotnet pack -c:Release -p:Version=$(echo ${{ github.ref_name }} | sed 's/^v//') -p:RepositoryCommit=${{ github.sha }}
+      - run: dotnet nuget push ./src/TypedRoutes/bin/Release/PodNet.Blazor.TypedRoutes.*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
diff --git a/src/TypedRoutes/PodNet.Blazor.TypedRoutes.csproj b/src/TypedRoutes/PodNet.Blazor.TypedRoutes.csproj
index 501ced7..0edb782 100644
--- a/src/TypedRoutes/PodNet.Blazor.TypedRoutes.csproj
+++ b/src/TypedRoutes/PodNet.Blazor.TypedRoutes.csproj
@@ -4,14 +4,14 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 		<!-- Version is set via Git tagging triggering the build and supplying that tag to `dotnet pack -p:Version`. -->
-		<Version>0.0.0-unset</Version>
+		<Version Condition="('$(Version)' == '') And ('$(Configuration)' == 'Debug')">0.0.0-debug</Version>
 
 		<IsPackable>true</IsPackable>
 		<IncludeSymbols>false</IncludeSymbols>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<DevelopmentDependency>true</DevelopmentDependency>
 		<NoWarn>$(NoWarn);NU5128</NoWarn>
-		
+
 		<PackageId>PodNet.Blazor.TypedRoutes</PackageId>
 		<Product>PodNet.Blazor.TypedRoutes</Product>
 		<PackageVersion>$(Version)</PackageVersion>
@@ -33,7 +33,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" PrivateAssets="all" />
-		
+
 		<None Include="..\..\images\icon.png" Pack="true" PackagePath="" />
 		<None Include="..\..\README.md" Pack="true" PackagePath="" />
 	</ItemGroup>
diff --git a/src/TypedRoutes/TypedRoutesGenerator.cs b/src/TypedRoutes/TypedRoutesGenerator.cs
index fcb764c..98d633c 100644
--- a/src/TypedRoutes/TypedRoutesGenerator.cs
+++ b/src/TypedRoutes/TypedRoutesGenerator.cs
@@ -107,7 +107,7 @@ static IEnumerable<RouteInfo> GetRoutesFromPageDirectives((AdditionalText Additi
                     @namespace = input.Build.RootNamespace;
             }
 
-            var @className = Path.GetFileNameWithoutExtension(input.AdditionalText.Path);
+            var @className = Path.GetFileNameWithoutExtension(input.AdditionalText.Path).Replace('-', '_');
             if (typeparam != null)
                 @className += $"<{typeparam}>";