diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 72928f72c..ad1c9b9a5 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -24,50 +24,50 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestPackages", "TestPackage
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}"
 	ProjectSection(SolutionItems) = preProject
-		build\Microsoft.DotNet.Cli.Branding.props = build\Microsoft.DotNet.Cli.Branding.props
-		build\Microsoft.DotNet.Cli.BranchInfo.props = build\Microsoft.DotNet.Cli.BranchInfo.props
-		build\Microsoft.DotNet.Cli.BuildDefaults.props = build\Microsoft.DotNet.Cli.BuildDefaults.props
-		build\Microsoft.DotNet.Cli.BundledSdks.proj = build\Microsoft.DotNet.Cli.BundledSdks.proj
+		build\Branding.props = build\Branding.props
+		build\BranchInfo.props = build\BranchInfo.props
+		build\BuildDefaults.props = build\BuildDefaults.props
+		build\BundledSdks.proj = build\BundledSdks.proj
 		build\Microsoft.DotNet.Cli.BundledRuntimes.props = build\Microsoft.DotNet.Cli.BundledRuntimes.props
-		build\Microsoft.DotNet.Cli.BundledSdks.props = build\Microsoft.DotNet.Cli.BundledSdks.props
-		build\Microsoft.DotNet.Cli.BundledTemplates.proj = build\Microsoft.DotNet.Cli.BundledTemplates.proj
-		build\Microsoft.DotNet.Cli.BundledTemplates.props = build\Microsoft.DotNet.Cli.BundledTemplates.props
-		build\Microsoft.DotNet.Cli.Compile.targets = build\Microsoft.DotNet.Cli.Compile.targets
-		build\Microsoft.DotNet.Cli.CoreSetupInfo.props = build\Microsoft.DotNet.Cli.CoreSetupInfo.props
+		build\BundledSdks.props = build\BundledSdks.props
+		build\BundledTemplates.proj = build\BundledTemplates.proj
+		build\BundledTemplates.props = build\BundledTemplates.props
+		build\Compile.targets = build\Compile.targets
+		build\CoreSetupInfo.props = build\CoreSetupInfo.props
 		build\Microsoft.DotNet.Cli.DependencyVersions.props = build\Microsoft.DotNet.Cli.DependencyVersions.props
-		build\Microsoft.DotNet.Cli.FileExtensions.props = build\Microsoft.DotNet.Cli.FileExtensions.props
-		build\Microsoft.DotNet.Cli.GitCommitInfo.targets = build\Microsoft.DotNet.Cli.GitCommitInfo.targets
-		build\Microsoft.DotNet.Cli.HostInfo.targets = build\Microsoft.DotNet.Cli.HostInfo.targets
-		build\Microsoft.DotNet.Cli.InitRepo.props = build\Microsoft.DotNet.Cli.InitRepo.props
-		build\Microsoft.DotNet.Cli.InitRepo.targets = build\Microsoft.DotNet.Cli.InitRepo.targets
-		build\Microsoft.DotNet.Cli.InputDirectories.props = build\Microsoft.DotNet.Cli.InputDirectories.props
-		build\Microsoft.DotNet.Cli.OutputDirectories.props = build\Microsoft.DotNet.Cli.OutputDirectories.props
-		build\Microsoft.DotNet.Cli.Package.targets = build\Microsoft.DotNet.Cli.Package.targets
-		build\Microsoft.DotNet.Cli.Prepare.targets = build\Microsoft.DotNet.Cli.Prepare.targets
-		build\Microsoft.DotNet.Cli.Publish.targets = build\Microsoft.DotNet.Cli.Publish.targets
-		build\Microsoft.DotNet.Cli.Run.targets = build\Microsoft.DotNet.Cli.Run.targets
-		build\Microsoft.DotNet.Cli.Signing.proj = build\Microsoft.DotNet.Cli.Signing.proj
-		build\Microsoft.DotNet.Cli.Stage0.props = build\Microsoft.DotNet.Cli.Stage0.props
-		build\Microsoft.DotNet.Cli.tasks = build\Microsoft.DotNet.Cli.tasks
-		build\Microsoft.DotNet.Cli.Test.targets = build\Microsoft.DotNet.Cli.Test.targets
-		build\Microsoft.DotNet.Cli.Version.props = build\Microsoft.DotNet.Cli.Version.props
-		build\Microsoft.DotNet.Cli.VersionBadge.props = build\Microsoft.DotNet.Cli.VersionBadge.props
+		build\FileExtensions.props = build\FileExtensions.props
+		build\GitCommitInfo.targets = build\GitCommitInfo.targets
+		build\HostInfo.targets = build\HostInfo.targets
+		build\InitRepo.props = build\InitRepo.props
+		build\InitRepo.targets = build\InitRepo.targets
+		build\InputDirectories.props = build\InputDirectories.props
+		build\OutputDirectories.props = build\OutputDirectories.props
+		build\Package.targets = build\Package.targets
+		build\Prepare.targets = build\Prepare.targets
+		build\Publish.targets = build\Publish.targets
+		build\Run.targets = build\Run.targets
+		build\Signing.proj = build\Signing.proj
+		build\Stage0.props = build\Stage0.props
+		build\tasks = build\tasks
+		build\Test.targets = build\Test.targets
+		build\Version.props = build\Version.props
+		build\VersionBadge.props = build\VersionBadge.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"
 	ProjectSection(SolutionItems) = preProject
-		build\package\Microsoft.DotNet.Cli.Archive.targets = build\package\Microsoft.DotNet.Cli.Archive.targets
-		build\package\Microsoft.DotNet.Cli.Installer.DEB.proj = build\package\Microsoft.DotNet.Cli.Installer.DEB.proj
-		build\package\Microsoft.DotNet.Cli.Installer.DEB.targets = build\package\Microsoft.DotNet.Cli.Installer.DEB.targets
-		build\package\Microsoft.DotNet.Cli.Installer.MSI.targets = build\package\Microsoft.DotNet.Cli.Installer.MSI.targets
-		build\package\Microsoft.DotNet.Cli.Installer.PKG.targets = build\package\Microsoft.DotNet.Cli.Installer.PKG.targets
-		build\package\Microsoft.DotNet.Cli.Layout.targets = build\package\Microsoft.DotNet.Cli.Layout.targets
-		build\package\Microsoft.DotNet.Cli.Nupkg.targets = build\package\Microsoft.DotNet.Cli.Nupkg.targets
+		build\package\Archive.targets = build\package\Archive.targets
+		build\package\Installer.DEB.proj = build\package\Installer.DEB.proj
+		build\package\Installer.DEB.targets = build\package\Installer.DEB.targets
+		build\package\Installer.MSI.targets = build\package\Installer.MSI.targets
+		build\package\Installer.PKG.targets = build\package\Installer.PKG.targets
+		build\package\Layout.targets = build\package\Layout.targets
+		build\package\Nupkg.targets = build\package\Nupkg.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "compile", "compile", "{8E3354BD-827F-41B7-9EE6-6BE1F1EDD8E9}"
 	ProjectSection(SolutionItems) = preProject
-		build\compile\Microsoft.DotNet.Cli.LzmaArchive.targets = build\compile\Microsoft.DotNet.Cli.LzmaArchive.targets
+		build\compile\LzmaArchive.targets = build\compile\LzmaArchive.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2DE2-47F6-8C35-3CF0589CF2B8}"
@@ -81,8 +81,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B12960-ABB0-4903-9C60-5E9157E659C8}"
 	ProjectSection(SolutionItems) = preProject
 		build\publish\FinishBuild.targets = build\publish\FinishBuild.targets
-		build\publish\Microsoft.DotNet.Cli.Badge.targets = build\publish\Microsoft.DotNet.Cli.Badge.targets
-		build\publish\Microsoft.DotNet.Cli.Checksum.targets = build\publish\Microsoft.DotNet.Cli.Checksum.targets
+		build\publish\Badge.targets = build\publish\Badge.targets
+		build\publish\Checksum.targets = build\publish\Checksum.targets
 		build\publish\PublishContent.targets = build\publish\PublishContent.targets
 	EndProjectSection
 EndProject
@@ -90,7 +90,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_p
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}"
 	ProjectSection(SolutionItems) = preProject
-		build\crossgen\Microsoft.DotNet.Cli.Crossgen.targets = build\crossgen\Microsoft.DotNet.Cli.Crossgen.targets
+		build\crossgen\Crossgen.targets = build\crossgen\Crossgen.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}"
diff --git a/build.proj b/build.proj
index 313f37016..54372ad1c 100644
--- a/build.proj
+++ b/build.proj
@@ -45,14 +45,14 @@
 
   <Target Name="BuildTheWholeCli" DependsOnTargets="$(CLITargets)" />
 
-  <Import Project="build/Microsoft.DotNet.Cli.GitCommitInfo.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.HostInfo.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Compile.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Package.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Test.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Publish.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Run.targets" />
+  <Import Project="build/GitCommitInfo.targets" />
+  <Import Project="build/HostInfo.targets" />
+  <Import Project="build/Prepare.targets" />
+  <Import Project="build/Compile.targets" />
+  <Import Project="build/Package.targets" />
+  <Import Project="build/Test.targets" />
+  <Import Project="build/Publish.targets" />
+  <Import Project="build/Run.targets" />
 
-  <Import Project="build/Microsoft.DotNet.Cli.InitRepo.targets" />
+  <Import Project="build/InitRepo.targets" />
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.BranchInfo.props b/build/BranchInfo.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BranchInfo.props
rename to build/BranchInfo.props
diff --git a/build/Microsoft.DotNet.Cli.Branding.props b/build/Branding.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Branding.props
rename to build/Branding.props
diff --git a/build/Microsoft.DotNet.Cli.BuildDefaults.props b/build/BuildDefaults.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BuildDefaults.props
rename to build/BuildDefaults.props
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.proj b/build/BundledSdks.proj
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledSdks.proj
rename to build/BundledSdks.proj
diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/BundledSdks.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledSdks.props
rename to build/BundledSdks.props
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.proj b/build/BundledTemplates.proj
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledTemplates.proj
rename to build/BundledTemplates.proj
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.props b/build/BundledTemplates.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.BundledTemplates.props
rename to build/BundledTemplates.props
diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Compile.targets
similarity index 97%
rename from build/Microsoft.DotNet.Cli.Compile.targets
rename to build/Compile.targets
index ebe98dd4d..b32af2e07 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Compile.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="compile/Microsoft.DotNet.Cli.LzmaArchive.targets" />
-  <Import Project="crossgen/Microsoft.DotNet.Cli.Crossgen.targets" />
+  <Import Project="compile/LzmaArchive.targets" />
+  <Import Project="crossgen/Crossgen.targets" />
 
   <PropertyGroup>
     <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
@@ -245,7 +245,7 @@
   <Target Name="PublishSdks"
           DependsOnTargets="Prepare">
     <ItemGroup>
-      <SdksToBundle Include="build/Microsoft.DotNet.Cli.BundledSdks.proj">
+      <SdksToBundle Include="build/BundledSdks.proj">
         <Properties>
           CLIBuildDll=$(CLIBuildDll);
           NuGetPackagesDir=$(NuGetPackagesDir);
@@ -266,7 +266,7 @@
   <Target Name="PublishTemplates"
           DependsOnTargets="Prepare">
     <ItemGroup>
-      <TemplatesToBundle Include="build/Microsoft.DotNet.Cli.BundledTemplates.proj">
+      <TemplatesToBundle Include="build/BundledTemplates.proj">
         <Properties>
           TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates;
           TemplatePackageName=%(BundledTemplate.Identity);
diff --git a/build/Microsoft.DotNet.Cli.CoreSetupInfo.props b/build/CoreSetupInfo.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.CoreSetupInfo.props
rename to build/CoreSetupInfo.props
diff --git a/build/Microsoft.DotNet.Cli.FileExtensions.props b/build/FileExtensions.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.FileExtensions.props
rename to build/FileExtensions.props
diff --git a/build/Microsoft.DotNet.Cli.GitCommitInfo.targets b/build/GitCommitInfo.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.GitCommitInfo.targets
rename to build/GitCommitInfo.targets
diff --git a/build/Microsoft.DotNet.Cli.HostInfo.targets b/build/HostInfo.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.HostInfo.targets
rename to build/HostInfo.targets
diff --git a/build/Microsoft.DotNet.Cli.InitRepo.props b/build/InitRepo.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.InitRepo.props
rename to build/InitRepo.props
diff --git a/build/Microsoft.DotNet.Cli.InitRepo.targets b/build/InitRepo.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.InitRepo.targets
rename to build/InitRepo.targets
diff --git a/build/Microsoft.DotNet.Cli.InputDirectories.props b/build/InputDirectories.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.InputDirectories.props
rename to build/InputDirectories.props
diff --git a/build/Microsoft.DotNet.Cli.OutputDirectories.props b/build/OutputDirectories.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.OutputDirectories.props
rename to build/OutputDirectories.props
diff --git a/build/Microsoft.DotNet.Cli.Package.targets b/build/Package.targets
similarity index 52%
rename from build/Microsoft.DotNet.Cli.Package.targets
rename to build/Package.targets
index 2ff1ac420..17626cd45 100644
--- a/build/Microsoft.DotNet.Cli.Package.targets
+++ b/build/Package.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Layout.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Archive.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Nupkg.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.DEB.proj" />
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.MSI.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/package/Microsoft.DotNet.Cli.Installer.PKG.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Layout.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Archive.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Nupkg.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Installer.DEB.proj" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Installer.MSI.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/package/Installer.PKG.targets" />
 
   <Target Name="GenerateInstallers"
           Condition=" '$(SkipBuildingInstallers)' != 'true' "
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Prepare.targets
similarity index 97%
rename from build/Microsoft.DotNet.Cli.Prepare.targets
rename to build/Prepare.targets
index cd8954107..2d335945d 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Prepare.targets
@@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Microsoft.DotNet.Cli.tasks" />
   <Import Project="prepare/CheckPrereqs.targets" />
-  <Import Project="Microsoft.DotNet.Cli.BundledSdks.props" />
-  <Import Project="Microsoft.DotNet.Cli.BundledTemplates.props" />
+  <Import Project="BundledSdks.props" />
+  <Import Project="BundledTemplates.props" />
 
   <Target Name="Prepare"
           DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages" />
diff --git a/build/Microsoft.DotNet.Cli.Publish.targets b/build/Publish.targets
similarity index 96%
rename from build/Microsoft.DotNet.Cli.Publish.targets
rename to build/Publish.targets
index 9c66a492c..faca97224 100644
--- a/build/Microsoft.DotNet.Cli.Publish.targets
+++ b/build/Publish.targets
@@ -2,8 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)/publish/FinishBuild.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/PublishContent.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Badge.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)/publish/Microsoft.DotNet.Cli.Checksum.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/publish/Badge.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)/publish/Checksum.targets" />
 
   <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
   <Target Name="Publish"
diff --git a/build/Microsoft.DotNet.Cli.Run.targets b/build/Run.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Run.targets
rename to build/Run.targets
diff --git a/build/Microsoft.DotNet.Cli.Signing.proj b/build/Signing.proj
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Signing.proj
rename to build/Signing.proj
diff --git a/build/Microsoft.DotNet.Cli.Stage0.props b/build/Stage0.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Stage0.props
rename to build/Stage0.props
diff --git a/build/Microsoft.DotNet.Cli.Test.targets b/build/Test.targets
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Test.targets
rename to build/Test.targets
diff --git a/build/Microsoft.DotNet.Cli.Version.props b/build/Version.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.Version.props
rename to build/Version.props
diff --git a/build/Microsoft.DotNet.Cli.VersionBadge.props b/build/VersionBadge.props
similarity index 100%
rename from build/Microsoft.DotNet.Cli.VersionBadge.props
rename to build/VersionBadge.props
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/LzmaArchive.targets
similarity index 100%
rename from build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
rename to build/compile/LzmaArchive.targets
diff --git a/build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets b/build/crossgen/Crossgen.targets
similarity index 100%
rename from build/crossgen/Microsoft.DotNet.Cli.Crossgen.targets
rename to build/crossgen/Crossgen.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Archive.targets b/build/package/Archive.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Archive.targets
rename to build/package/Archive.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj b/build/package/Installer.DEB.proj
similarity index 98%
rename from build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
rename to build/package/Installer.DEB.proj
index fb4aab4a6..04e9f7e4b 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -3,7 +3,7 @@
 
   <UsingTask TaskName="DotNetDebTool" AssemblyFile="$(CLIBuildDll)" />
 
-  <Import Project="Microsoft.DotNet.Cli.Installer.DEB.targets" />
+  <Import Project="Installer.DEB.targets" />
 
   <Target Name="GenerateDebs"
           DependsOnTargets="SetupDebProps;
@@ -156,7 +156,7 @@
   </Target>
 
   <Target Name="WriteDotnetDebToolProjectJson"
-          Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Microsoft.DotNet.Cli.Installer.DEB.props"
+          Inputs="$(MSBuildThisFile);$(MSBuildThisFileDirectory)/Installer.DEB.props"
           Outputs="$(DotnetDebToolDir)/project.json">
 
     <MakeDir Condition=" !Exists($(DotnetDebToolDir)) " 
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Installer.DEB.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
rename to build/package/Installer.DEB.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets b/build/package/Installer.MSI.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
rename to build/package/Installer.MSI.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.PKG.targets b/build/package/Installer.PKG.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Installer.PKG.targets
rename to build/package/Installer.PKG.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Layout.targets b/build/package/Layout.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Layout.targets
rename to build/package/Layout.targets
diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Nupkg.targets
similarity index 100%
rename from build/package/Microsoft.DotNet.Cli.Nupkg.targets
rename to build/package/Nupkg.targets
diff --git a/build/publish/Microsoft.DotNet.Cli.Badge.targets b/build/publish/Badge.targets
similarity index 100%
rename from build/publish/Microsoft.DotNet.Cli.Badge.targets
rename to build/publish/Badge.targets
diff --git a/build/publish/Microsoft.DotNet.Cli.Checksum.targets b/build/publish/Checksum.targets
similarity index 100%
rename from build/publish/Microsoft.DotNet.Cli.Checksum.targets
rename to build/publish/Checksum.targets
diff --git a/dir.props b/dir.props
index 6bbde4f9b..8425f4625 100644
--- a/dir.props
+++ b/dir.props
@@ -4,22 +4,22 @@
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
   </PropertyGroup>
 
-  <Import Project="build/Microsoft.DotNet.Cli.InitRepo.props" />
+  <Import Project="build/InitRepo.props" />
   <Import Condition=" Exists('$(GitCommitInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(GitCommitInfoProps)" />
   <Import Condition=" Exists('$(HostInfoProps)') Or '$(GeneratingPropsFile)' != 'true' " Project="$(HostInfoProps)" />
   
-  <Import Project="build/Microsoft.DotNet.Cli.BranchInfo.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.CoreSetupInfo.props" />
+  <Import Project="build/BranchInfo.props" />
+  <Import Project="build/CoreSetupInfo.props" />
 
   <Import Project="build/Microsoft.DotNet.Cli.DependencyVersions.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.FileExtensions.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.InputDirectories.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.OutputDirectories.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.BuildDefaults.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.Stage0.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.Version.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.Branding.props" />
-  <Import Project="build/Microsoft.DotNet.Cli.VersionBadge.props" />
+  <Import Project="build/FileExtensions.props" />
+  <Import Project="build/InputDirectories.props" />
+  <Import Project="build/OutputDirectories.props" />
+  <Import Project="build/BuildDefaults.props" />
+  <Import Project="build/Stage0.props" />
+  <Import Project="build/Version.props" />
+  <Import Project="build/Branding.props" />
+  <Import Project="build/VersionBadge.props" />
   <Import Project="build/Microsoft.DotNet.Cli.BundledRuntimes.props" />
   
   <PropertyGroup>