diff --git a/WinSW.nuspec b/WinSW.nuspec
index fad1fb1..41b20e8 100644
--- a/WinSW.nuspec
+++ b/WinSW.nuspec
@@ -25,7 +25,7 @@ More info about the wrapper is available in the projects GitHub repository.
     </dependencies>
   </metadata>
   <files>
-    <file src="artifacts\publish\WinSW.NET461.exe" target="lib\net461\WinSW.NET461.exe" />
-    <file src="samples\sample-complete.xml" target="lib\net461\WinSW.NET461.xml" />
+    <file src="artifacts\publish\WinSW-net461.exe" target="lib\net461\WinSW-net461.exe" />
+    <file src="samples\sample-complete.xml" target="lib\net461\WinSW-net461.xml" />
   </files>
 </package>
diff --git a/eng/build.yml b/eng/build.yml
index 867a871..786204a 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -59,8 +59,8 @@ jobs:
       versioningScheme: byEnvVar
       versionEnvVar: BuildVersion
 
-  - publish: artifacts\publish\WinSW.NET461.exe
-    artifact: WinSW.NET461.exe_$(BuildConfiguration)
+  - publish: artifacts\publish\WinSW-net461.exe
+    artifact: WinSW-net461.exe_$(BuildConfiguration)
     displayName: Publish .NET 4.6.1
 
   - publish: artifacts\publish\WinSW-x64.zip
diff --git a/src/WinSW.Tests/Util/Layout.cs b/src/WinSW.Tests/Util/Layout.cs
index b0ed01b..ec9f35b 100644
--- a/src/WinSW.Tests/Util/Layout.cs
+++ b/src/WinSW.Tests/Util/Layout.cs
@@ -36,7 +36,7 @@ namespace WinSW.Tests.Util
 
         internal static string ArtifactsDirectory => artifactsDirectory ??= Path.Combine(RepositoryRoot, "artifacts");
 
-        internal static string NET461Exe => Path.Combine(ArtifactsDirectory, "publish", "WinSW.NET461.exe");
+        internal static string NET461Exe => Path.Combine(ArtifactsDirectory, "publish", "WinSW-net461.exe");
 
         internal static string WinSWExe =>
 #if NET
diff --git a/src/WinSW/WinSW.csproj b/src/WinSW/WinSW.csproj
index 5e1648f..a8d6188 100644
--- a/src/WinSW/WinSW.csproj
+++ b/src/WinSW/WinSW.csproj
@@ -65,10 +65,6 @@
   <!-- Merge plugins and other DLLs into the executable -->
   <Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net5.0-windows'">
 
-    <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-      <TargetFrameworkSuffix>NET461</TargetFrameworkSuffix>
-    </PropertyGroup>
-
     <PropertyGroup>
       <InputAssemblies>"$(OutDir)$(TargetFileName)"</InputAssemblies>
       <InputAssemblies>$(InputAssemblies) "$(OutDir)WinSW.Core.dll"</InputAssemblies>
@@ -80,7 +76,7 @@
       <InputAssemblies>$(InputAssemblies) "$(OutDir)System.Numerics.Vectors.dll"</InputAssemblies>
       <InputAssemblies>$(InputAssemblies) "$(OutDir)System.Runtime.CompilerServices.Unsafe.dll"</InputAssemblies>
       <InputAssemblies>$(InputAssemblies) "$(OutDir)System.ValueTuple.dll"</InputAssemblies>
-      <OutputAssembly>"$(ArtifactsPublishDir)WinSW.$(TargetFrameworkSuffix).exe"</OutputAssembly>
+      <OutputAssembly>"$(ArtifactsPublishDir)WinSW-$(TargetFramework).exe"</OutputAssembly>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -96,7 +92,7 @@
 
   <UsingTask TaskName="WinSW.Tasks.Trim" AssemblyFile="$(ArtifactsBinDir)WinSW.Tasks\$(Configuration)\net461\WinSW.Tasks.dll" />
   <Target Name="Trim" AfterTargets="Merge" Condition="'$(TargetFramework)' != 'net5.0-windows'">
-    <Trim Path="$(ArtifactsPublishDir)WinSW.$(TargetFrameworkSuffix).exe" />
+    <Trim Path="$(ArtifactsPublishDir)WinSW-$(TargetFramework).exe" />
   </Target>
 
 </Project>