diff --git a/source2/Builder/Cosmos.MSBuild.Tasks/BuildOSImage.cs b/source2/Builder/Cosmos.MSBuild.Tasks/BuildOSImage.cs
index 381e90860..44c012ac9 100644
--- a/source2/Builder/Cosmos.MSBuild.Tasks/BuildOSImage.cs
+++ b/source2/Builder/Cosmos.MSBuild.Tasks/BuildOSImage.cs
@@ -5,7 +5,7 @@ using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 //using Cosmos.Compiler.Builder;
 
-namespace Cosmos.MSBuild.Tasks {
+namespace Cosmos.Builder.MSBuild {
 	
   public class BuildOSImage : Task {
 
diff --git a/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.MSBuild.Tasks.csproj b/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.csproj
similarity index 94%
rename from source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.MSBuild.Tasks.csproj
rename to source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.csproj
index fe0e1c45c..d5baf9c2c 100644
--- a/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.MSBuild.Tasks.csproj
+++ b/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{71E5DE71-F7C1-4B61-B5BE-4FD64682BDB0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cosmos.MSBuild.Tasks</RootNamespace>
-    <AssemblyName>Cosmos.MSBuild.Tasks</AssemblyName>
+    <RootNamespace>Cosmos.Builder.MSBuild</RootNamespace>
+    <AssemblyName>Cosmos.Builder.MSBuild</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
diff --git a/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.MSBuild.Tasks.csproj.vspscc b/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.csproj.vspscc
similarity index 100%
rename from source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.MSBuild.Tasks.csproj.vspscc
rename to source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.csproj.vspscc
diff --git a/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.sln b/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.sln
index 8e3a62f28..3f350ac60 100644
--- a/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.sln
+++ b/source2/Builder/Cosmos.MSBuild.Tasks/Cosmos.Builder.MSBuild.sln
@@ -1,15 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.MSBuild.Tasks", "Cosmos.MSBuild.Tasks.csproj", "{71E5DE71-F7C1-4B61-B5BE-4FD64682BDB0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Builder.MSBuild", "Cosmos.Builder.MSBuild.csproj", "{71E5DE71-F7C1-4B61-B5BE-4FD64682BDB0}"
 EndProject
 Global
 	GlobalSection(TeamFoundationVersionControl) = preSolution
 		SccNumberOfProjects = 2
 		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
 		SccTeamFoundationServer = https://tfs04.codeplex.com/
-		SccProjectUniqueName0 = Cosmos.MSBuild.Tasks.csproj
 		SccLocalPath0 = .
+		SccProjectUniqueName1 = Cosmos.Builder.MSBuild.csproj
 		SccLocalPath1 = .
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution