diff --git a/Mono.TextTemplating.Build.Tests/TestCases/PreprocessTemplate/PreprocessTemplate.csproj b/Mono.TextTemplating.Build.Tests/TestCases/PreprocessTemplate/PreprocessTemplate.csproj
index 61e8671..3c6f7af 100644
--- a/Mono.TextTemplating.Build.Tests/TestCases/PreprocessTemplate/PreprocessTemplate.csproj
+++ b/Mono.TextTemplating.Build.Tests/TestCases/PreprocessTemplate/PreprocessTemplate.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.props" />
+  <Import Project="$(TemplatingTargetsPath)\T4.BuildTools.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -10,5 +10,5 @@
     <PackageReference Include="System.CodeDom" Version="5.0.0" />
   </ItemGroup>
 
-  <Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.targets" />
+  <Import Project="$(TemplatingTargetsPath)\T4.BuildTools.targets" />
 </Project>
\ No newline at end of file
diff --git a/Mono.TextTemplating.Build.Tests/TestCases/TransformTemplates/TransformTemplates.csproj b/Mono.TextTemplating.Build.Tests/TestCases/TransformTemplates/TransformTemplates.csproj
index 4f25c9f..085bcaa 100644
--- a/Mono.TextTemplating.Build.Tests/TestCases/TransformTemplates/TransformTemplates.csproj
+++ b/Mono.TextTemplating.Build.Tests/TestCases/TransformTemplates/TransformTemplates.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.props" />
+  <Import Project="$(TemplatingTargetsPath)\T4.BuildTools.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -11,5 +11,5 @@
     <T4Argument Include="Year" Value="2019" />
   </ItemGroup>
 
-  <Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.targets" />
+  <Import Project="$(TemplatingTargetsPath)\T4.BuildTools.targets" />
 </Project>
\ No newline at end of file
diff --git a/Mono.TextTemplating.Build.Tests/TestCases/TransformWithInclude/TransformWithInclude.csproj b/Mono.TextTemplating.Build.Tests/TestCases/TransformWithInclude/TransformWithInclude.csproj
index 51d70b5..532bdd2 100644
--- a/Mono.TextTemplating.Build.Tests/TestCases/TransformWithInclude/TransformWithInclude.csproj
+++ b/Mono.TextTemplating.Build.Tests/TestCases/TransformWithInclude/TransformWithInclude.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.props" />
+  <Import Project="$(TemplatingTargetsPath)\T4.BuildTools.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -12,5 +12,5 @@
     <T4Argument Include="Year" Value="2019" />
   </ItemGroup>
 
-  <Import Project="$(TemplatingTargetsPath)\Mono.TextTemplating.Build.targets" />
+  <Import Project="$(TemplatingTargetsPath)\T4.BuildTools.targets" />
 </Project>
\ No newline at end of file
diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj b/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj
index 2296357..df1e20f 100644
--- a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj
+++ b/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj
@@ -16,11 +16,11 @@
 
   <Target Name="AddTargetsFilesToPack" BeforeTargets="GenerateNuspec">
     <ItemGroup>
-      <_PackageFiles Include="Mono.TextTemplating.Build.props" PackagePath="build" Pack="true" />
-      <_PackageFiles Include="Mono.TextTemplating.Build.targets" PackagePath="build" Pack="true" />
-      <_PackageFiles Include="multitargeting.props" PackagePath="buildMultiTargeting\Mono.TextTemplating.Build.props" Pack="true" />
-      <_PackageFiles Include="multitargeting.targets" PackagePath="buildMultiTargeting\Mono.TextTemplating.Build.targets" Pack="true" />
-      <_PackageFiles Include="Mono.TextTemplating.Build.targets.buildschema.json" PackagePath="build" Pack="true" />
+      <_PackageFiles Include="T4.BuildTools.props" PackagePath="build\$(PackageId).props" Pack="true" />
+      <_PackageFiles Include="T4.BuildTools.targets" PackagePath="build\$(PackageId).targets" Pack="true" />
+      <_PackageFiles Include="multitargeting.props" PackagePath="buildMultiTargeting\$(PackageId).props" Pack="true" />
+      <_PackageFiles Include="multitargeting.targets" PackagePath="buildMultiTargeting\$(PackageId).targets" Pack="true" />
+      <_PackageFiles Include="T4.BuildTools.targets.buildschema.json" PackagePath="build\$(PackageId).targets.buildschema.json" Pack="true" />
     </ItemGroup>
   </Target>
 
diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.props b/Mono.TextTemplating.Build/T4.BuildTools.props
similarity index 100%
rename from Mono.TextTemplating.Build/Mono.TextTemplating.Build.props
rename to Mono.TextTemplating.Build/T4.BuildTools.props
diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.targets b/Mono.TextTemplating.Build/T4.BuildTools.targets
similarity index 96%
rename from Mono.TextTemplating.Build/Mono.TextTemplating.Build.targets
rename to Mono.TextTemplating.Build/T4.BuildTools.targets
index 1316dba..65e6336 100644
--- a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.targets
+++ b/Mono.TextTemplating.Build/T4.BuildTools.targets
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\netcoreapp2.1\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
-    <TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\net472\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
+    <TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\net6.0\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
+    <TextTransformTaskAssembly Condition="'$(TextTransformTaskAssembly)'=='' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\buildTasks\net48\Mono.TextTemplating.Build.dll</TextTransformTaskAssembly>
   </PropertyGroup>
 
   <UsingTask AssemblyFile="$(TextTransformTaskAssembly)" TaskName="TextTransform" />
diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.targets.buildschema.json b/Mono.TextTemplating.Build/T4.BuildTools.targets.buildschema.json
similarity index 100%
rename from Mono.TextTemplating.Build/Mono.TextTemplating.Build.targets.buildschema.json
rename to Mono.TextTemplating.Build/T4.BuildTools.targets.buildschema.json
diff --git a/Mono.TextTemplating.Build/multitargeting.props b/Mono.TextTemplating.Build/multitargeting.props
index 4ddf667..ed6ba79 100644
--- a/Mono.TextTemplating.Build/multitargeting.props
+++ b/Mono.TextTemplating.Build/multitargeting.props
@@ -1,3 +1,5 @@
 <Project>
-  <Import Project="..\build\Mono.TextTemplating.Build.props" />
-<Project>
\ No newline at end of file
+  <!--
+  <Import Project="..\build\$(MSBuildThisFileName).props" />
+  -->
+</Project>
\ No newline at end of file
diff --git a/Mono.TextTemplating.Build/multitargeting.targets b/Mono.TextTemplating.Build/multitargeting.targets
index 4c52422..c8b8545 100644
--- a/Mono.TextTemplating.Build/multitargeting.targets
+++ b/Mono.TextTemplating.Build/multitargeting.targets
@@ -1,3 +1,5 @@
 <Project>
-  <Import Project="..\build\Mono.TextTemplating.Build.targets" />
-<Project>
\ No newline at end of file
+  <!--
+  <Import Project="..\build\$(MSBuildThisFileName).targets" />
+  -->
+</Project>
\ No newline at end of file
diff --git a/dotnet-t4/dotnet-t4.csproj b/dotnet-t4/dotnet-t4.csproj
index 60604a4..ed1bb28 100644
--- a/dotnet-t4/dotnet-t4.csproj
+++ b/dotnet-t4/dotnet-t4.csproj
@@ -4,9 +4,10 @@
     <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>t4</AssemblyName>
     <PackageId>dotnet-t4</PackageId>
+    <PackAsTool>True</PackAsTool>
+    <ToolCommandName>t4</ToolCommandName>
     <RollForward>LatestMajor</RollForward>
     <Description>Command-line tool for processing T4 templates, a general-purpose way to generate text or code files using C#</Description>
-    <ToolCommandName>t4</ToolCommandName>
     <RootNamespace>Mono.TextTemplating</RootNamespace>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>