diff --git a/.gitattributes b/.gitattributes
index 845f434f66..592767978b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,6 +20,4 @@
 *.ico binary
 *.snk binary
 *.pdb binary
-*.svg binary
-
-*.approved.* binary
\ No newline at end of file
+*.svg binary
\ No newline at end of file
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
index afbbb739d8..c1047738fc 100644
--- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
+++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -1,46 +1,47 @@
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.3.4.0")]
-[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-06")]
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-sealed class ReleaseDateAttribute : System.Attribute
-{
-    public string Date { get; private set; }
-
-    public ReleaseDateAttribute(string date)
-    {
-        Date = date;
-    }
-}
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-static class GitVersionInformation
-{
-    public static string Major = "2";
-    public static string Minor = "3";
-    public static string Patch = "4";
-    public static string PreReleaseTag = "beta.5";
-    public static string PreReleaseTagWithDash = "-beta.5";
-    public static string BuildMetaData = "6";
-    public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
-    public static string MajorMinorPatch = "2.3.4";
-    public static string SemVer = "2.3.4-beta.5";
-    public static string LegacySemVer = "2.3.4-beta5";
-    public static string LegacySemVerPadded = "2.3.4-beta0005";
-    public static string AssemblySemVer = "2.0.0.0";
-    public static string FullSemVer = "2.3.4-beta.5+6";
-    public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
-    public static string BranchName = "master";
-    public static string Sha = "commitSha";
-    public static string NuGetVersionV2 = "2.3.4-beta0005";
-    public static string NuGetVersion = "2.3.4-beta0005";
-    public static string CommitDate = "2014-03-06";
-
-}
-
-
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.3.4.0")]
+[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
+[assembly: Fake.ReleaseDate("2014-03-06")]
+
+namespace Fake
+{
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    sealed class ReleaseDateAttribute : System.Attribute
+    {
+        public string Date { get; private set; }
+
+        public ReleaseDateAttribute(string date)
+        {
+            Date = date;
+        }
+    }
+
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {
+        public static string Major = "2";
+        public static string Minor = "3";
+        public static string Patch = "4";
+        public static string PreReleaseTag = "beta.5";
+        public static string PreReleaseTagWithDash = "-beta.5";
+        public static string BuildMetaData = "6";
+        public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
+        public static string MajorMinorPatch = "2.3.4";
+        public static string SemVer = "2.3.4-beta.5";
+        public static string LegacySemVer = "2.3.4-beta5";
+        public static string LegacySemVerPadded = "2.3.4-beta0005";
+        public static string AssemblySemVer = "2.0.0.0";
+        public static string FullSemVer = "2.3.4-beta.5+6";
+        public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
+        public static string BranchName = "master";
+        public static string Sha = "commitSha";
+        public static string NuGetVersionV2 = "2.3.4-beta0005";
+        public static string NuGetVersion = "2.3.4-beta0005";
+        public static string CommitDate = "2014-03-06";
+
+    }
+}
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
index 832c7b23ad..4bd9fc75a1 100644
--- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
+++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -1,46 +1,47 @@
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.3.4.0")]
-[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-06")]
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-sealed class ReleaseDateAttribute : System.Attribute
-{
-    public string Date { get; private set; }
-
-    public ReleaseDateAttribute(string date)
-    {
-        Date = date;
-    }
-}
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-static class GitVersionInformation
-{
-    public static string Major = "2";
-    public static string Minor = "3";
-    public static string Patch = "4";
-    public static string PreReleaseTag = "beta.5";
-    public static string PreReleaseTagWithDash = "-beta.5";
-    public static string BuildMetaData = "6";
-    public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
-    public static string MajorMinorPatch = "2.3.4";
-    public static string SemVer = "2.3.4-beta.5";
-    public static string LegacySemVer = "2.3.4-beta5";
-    public static string LegacySemVerPadded = "2.3.4-beta0005";
-    public static string AssemblySemVer = "2.3.0.0";
-    public static string FullSemVer = "2.3.4-beta.5+6";
-    public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
-    public static string BranchName = "master";
-    public static string Sha = "commitSha";
-    public static string NuGetVersionV2 = "2.3.4-beta0005";
-    public static string NuGetVersion = "2.3.4-beta0005";
-    public static string CommitDate = "2014-03-06";
-
-}
-
-
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.4.0")]
+[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
+[assembly: Fake.ReleaseDate("2014-03-06")]
+
+namespace Fake
+{
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    sealed class ReleaseDateAttribute : System.Attribute
+    {
+        public string Date { get; private set; }
+
+        public ReleaseDateAttribute(string date)
+        {
+            Date = date;
+        }
+    }
+
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {
+        public static string Major = "2";
+        public static string Minor = "3";
+        public static string Patch = "4";
+        public static string PreReleaseTag = "beta.5";
+        public static string PreReleaseTagWithDash = "-beta.5";
+        public static string BuildMetaData = "6";
+        public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
+        public static string MajorMinorPatch = "2.3.4";
+        public static string SemVer = "2.3.4-beta.5";
+        public static string LegacySemVer = "2.3.4-beta5";
+        public static string LegacySemVerPadded = "2.3.4-beta0005";
+        public static string AssemblySemVer = "2.3.0.0";
+        public static string FullSemVer = "2.3.4-beta.5+6";
+        public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
+        public static string BranchName = "master";
+        public static string Sha = "commitSha";
+        public static string NuGetVersionV2 = "2.3.4-beta0005";
+        public static string NuGetVersion = "2.3.4-beta0005";
+        public static string CommitDate = "2014-03-06";
+
+    }
+}
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
index 5607576322..cbd123be6d 100644
--- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
+++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -1,46 +1,47 @@
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyVersion("2.3.4.0")]
-[assembly: AssemblyFileVersion("2.3.4.0")]
-[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-06")]
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-sealed class ReleaseDateAttribute : System.Attribute
-{
-    public string Date { get; private set; }
-
-    public ReleaseDateAttribute(string date)
-    {
-        Date = date;
-    }
-}
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-static class GitVersionInformation
-{
-    public static string Major = "2";
-    public static string Minor = "3";
-    public static string Patch = "4";
-    public static string PreReleaseTag = "beta.5";
-    public static string PreReleaseTagWithDash = "-beta.5";
-    public static string BuildMetaData = "6";
-    public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
-    public static string MajorMinorPatch = "2.3.4";
-    public static string SemVer = "2.3.4-beta.5";
-    public static string LegacySemVer = "2.3.4-beta5";
-    public static string LegacySemVerPadded = "2.3.4-beta0005";
-    public static string AssemblySemVer = "2.3.4.0";
-    public static string FullSemVer = "2.3.4-beta.5+6";
-    public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
-    public static string BranchName = "master";
-    public static string Sha = "commitSha";
-    public static string NuGetVersionV2 = "2.3.4-beta0005";
-    public static string NuGetVersion = "2.3.4-beta0005";
-    public static string CommitDate = "2014-03-06";
-
-}
-
-
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyVersion("2.3.4.0")]
+[assembly: AssemblyFileVersion("2.3.4.0")]
+[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
+[assembly: Fake.ReleaseDate("2014-03-06")]
+
+namespace Fake
+{
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    sealed class ReleaseDateAttribute : System.Attribute
+    {
+        public string Date { get; private set; }
+
+        public ReleaseDateAttribute(string date)
+        {
+            Date = date;
+        }
+    }
+
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {
+        public static string Major = "2";
+        public static string Minor = "3";
+        public static string Patch = "4";
+        public static string PreReleaseTag = "beta.5";
+        public static string PreReleaseTagWithDash = "-beta.5";
+        public static string BuildMetaData = "6";
+        public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
+        public static string MajorMinorPatch = "2.3.4";
+        public static string SemVer = "2.3.4-beta.5";
+        public static string LegacySemVer = "2.3.4-beta5";
+        public static string LegacySemVerPadded = "2.3.4-beta0005";
+        public static string AssemblySemVer = "2.3.4.0";
+        public static string FullSemVer = "2.3.4-beta.5+6";
+        public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
+        public static string BranchName = "master";
+        public static string Sha = "commitSha";
+        public static string NuGetVersionV2 = "2.3.4-beta0005";
+        public static string NuGetVersion = "2.3.4-beta0005";
+        public static string CommitDate = "2014-03-06";
+
+    }
+}
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
index 24aebf881f..cf4392da2d 100644
--- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
+++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
@@ -1,46 +1,47 @@
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyVersion("2.3.4.5")]
-[assembly: AssemblyFileVersion("2.3.4.0")]
-[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-06")]
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-sealed class ReleaseDateAttribute : System.Attribute
-{
-    public string Date { get; private set; }
-
-    public ReleaseDateAttribute(string date)
-    {
-        Date = date;
-    }
-}
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-static class GitVersionInformation
-{
-    public static string Major = "2";
-    public static string Minor = "3";
-    public static string Patch = "4";
-    public static string PreReleaseTag = "beta.5";
-    public static string PreReleaseTagWithDash = "-beta.5";
-    public static string BuildMetaData = "6";
-    public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
-    public static string MajorMinorPatch = "2.3.4";
-    public static string SemVer = "2.3.4-beta.5";
-    public static string LegacySemVer = "2.3.4-beta5";
-    public static string LegacySemVerPadded = "2.3.4-beta0005";
-    public static string AssemblySemVer = "2.3.4.5";
-    public static string FullSemVer = "2.3.4-beta.5+6";
-    public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
-    public static string BranchName = "master";
-    public static string Sha = "commitSha";
-    public static string NuGetVersionV2 = "2.3.4-beta0005";
-    public static string NuGetVersion = "2.3.4-beta0005";
-    public static string CommitDate = "2014-03-06";
-
-}
-
-
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyVersion("2.3.4.5")]
+[assembly: AssemblyFileVersion("2.3.4.0")]
+[assembly: AssemblyInformationalVersion("2.3.4-beta.5+6.Branch.master.Sha.commitSha")]
+[assembly: Fake.ReleaseDate("2014-03-06")]
+
+namespace Fake
+{
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    sealed class ReleaseDateAttribute : System.Attribute
+    {
+        public string Date { get; private set; }
+
+        public ReleaseDateAttribute(string date)
+        {
+            Date = date;
+        }
+    }
+
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {
+        public static string Major = "2";
+        public static string Minor = "3";
+        public static string Patch = "4";
+        public static string PreReleaseTag = "beta.5";
+        public static string PreReleaseTagWithDash = "-beta.5";
+        public static string BuildMetaData = "6";
+        public static string FullBuildMetaData = "6.Branch.master.Sha.commitSha";
+        public static string MajorMinorPatch = "2.3.4";
+        public static string SemVer = "2.3.4-beta.5";
+        public static string LegacySemVer = "2.3.4-beta5";
+        public static string LegacySemVerPadded = "2.3.4-beta0005";
+        public static string AssemblySemVer = "2.3.4.5";
+        public static string FullSemVer = "2.3.4-beta.5+6";
+        public static string InformationalVersion = "2.3.4-beta.5+6.Branch.master.Sha.commitSha";
+        public static string BranchName = "master";
+        public static string Sha = "commitSha";
+        public static string NuGetVersionV2 = "2.3.4-beta0005";
+        public static string NuGetVersion = "2.3.4-beta0005";
+        public static string CommitDate = "2014-03-06";
+
+    }
+}
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
index 1ef7c2d027..f0c6488df1 100644
--- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
+++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -1,46 +1,47 @@
-
-using System;
-using System.Reflection;
-
-[assembly: AssemblyVersion("1.2.3.0")]
-[assembly: AssemblyFileVersion("1.2.3.0")]
-[assembly: AssemblyInformationalVersion("1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha")]
-[assembly: ReleaseDate("2014-03-06")]
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-sealed class ReleaseDateAttribute : System.Attribute
-{
-    public string Date { get; private set; }
-
-    public ReleaseDateAttribute(string date)
-    {
-        Date = date;
-    }
-}
-
-[System.Runtime.CompilerServices.CompilerGenerated]
-static class GitVersionInformation
-{
-    public static string Major = "1";
-    public static string Minor = "2";
-    public static string Patch = "3";
-    public static string PreReleaseTag = "unstable.4";
-    public static string PreReleaseTagWithDash = "-unstable.4";
-    public static string BuildMetaData = "5";
-    public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
-    public static string MajorMinorPatch = "1.2.3";
-    public static string SemVer = "1.2.3-unstable.4";
-    public static string LegacySemVer = "1.2.3-unstable4";
-    public static string LegacySemVerPadded = "1.2.3-unstable0004";
-    public static string AssemblySemVer = "1.2.3.0";
-    public static string FullSemVer = "1.2.3-unstable.4+5";
-    public static string InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha";
-    public static string BranchName = "feature1";
-    public static string Sha = "commitSha";
-    public static string NuGetVersionV2 = "1.2.3-unstable0004";
-    public static string NuGetVersion = "1.2.3-unstable0004";
-    public static string CommitDate = "2014-03-06";
-
-}
-
-
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyInformationalVersion("1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha")]
+[assembly: Fake.ReleaseDate("2014-03-06")]
+
+namespace Fake
+{
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    sealed class ReleaseDateAttribute : System.Attribute
+    {
+        public string Date { get; private set; }
+
+        public ReleaseDateAttribute(string date)
+        {
+            Date = date;
+        }
+    }
+
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {
+        public static string Major = "1";
+        public static string Minor = "2";
+        public static string Patch = "3";
+        public static string PreReleaseTag = "unstable.4";
+        public static string PreReleaseTagWithDash = "-unstable.4";
+        public static string BuildMetaData = "5";
+        public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
+        public static string MajorMinorPatch = "1.2.3";
+        public static string SemVer = "1.2.3-unstable.4";
+        public static string LegacySemVer = "1.2.3-unstable4";
+        public static string LegacySemVerPadded = "1.2.3-unstable0004";
+        public static string AssemblySemVer = "1.2.3.0";
+        public static string FullSemVer = "1.2.3-unstable.4+5";
+        public static string InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha";
+        public static string BranchName = "feature1";
+        public static string Sha = "commitSha";
+        public static string NuGetVersionV2 = "1.2.3-unstable0004";
+        public static string NuGetVersion = "1.2.3-unstable0004";
+        public static string CommitDate = "2014-03-06";
+
+    }
+}
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
index a29ce5d08f..7f9dc7969d 100644
--- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
+++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
@@ -11,7 +11,6 @@
 [TestFixture]
 public class AssemblyInfoBuilderTests
 {
-
     [Test]
     public void VerifyCreatedCode()
     {
@@ -26,14 +25,13 @@ public void VerifyCreatedCode()
         };
         var assemblyInfoBuilder = new AssemblyInfoBuilder();
         var versionVariables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
-        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables);
+        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables, "Fake");
         Approvals.Verify(assemblyInfoText);
 
         var compilation = CSharpCompilation.Create("Fake.dll")
             .WithOptions(new CSharpCompilationOptions(OutputKind.NetModule))
             .AddReferences(MetadataReference.CreateFromFile(typeof(object).Assembly.Location))
             .AddSyntaxTrees(CSharpSyntaxTree.ParseText(assemblyInfoText));
-        
 
         var emitResult = compilation.Emit(new MemoryStream());
         Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
@@ -80,7 +78,7 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
         };
         var assemblyInfoBuilder = new AssemblyInfoBuilder();
         var versionVariables = VariableProvider.GetVariablesFor(semanticVersion, avs, VersioningMode.ContinuousDelivery, "ci", false);
-        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables);
+        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables, "Fake");
         Approvals.Verify(assemblyInfoText);
 
         var compilation = CSharpCompilation.Create("Fake.dll")
@@ -91,4 +89,4 @@ static void VerifyAssemblyVersion(AssemblyVersioningScheme avs)
         var emitResult = compilation.Emit(new MemoryStream());
         Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
     }
-}
+}
\ No newline at end of file
diff --git a/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs b/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
index 241768ded0..f6e5919ea9 100644
--- a/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
+++ b/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
@@ -4,7 +4,7 @@
 
 public class AssemblyInfoBuilder
 {
-    public string GetAssemblyInfoText(VersionVariables vars)
+    public string GetAssemblyInfoText(VersionVariables vars, string assemblyName)
     {
         var assemblyInfo = string.Format(@"
 using System;
@@ -13,32 +13,34 @@ public string GetAssemblyInfoText(VersionVariables vars)
 [assembly: AssemblyVersion(""{0}"")]
 [assembly: AssemblyFileVersion(""{1}"")]
 [assembly: AssemblyInformationalVersion(""{2}"")]
-[assembly: ReleaseDate(""{3}"")]
+[assembly: {5}.ReleaseDate(""{3}"")]
 
-[System.Runtime.CompilerServices.CompilerGenerated]
-sealed class ReleaseDateAttribute : System.Attribute
+namespace {5}
 {{
-    public string Date {{ get; private set; }}
-
-    public ReleaseDateAttribute(string date)
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    sealed class ReleaseDateAttribute : System.Attribute
     {{
-        Date = date;
+        public string Date {{ get; private set; }}
+
+        public ReleaseDateAttribute(string date)
+        {{
+            Date = date;
+        }}
     }}
-}}
 
-[System.Runtime.CompilerServices.CompilerGenerated]
-static class GitVersionInformation
-{{
+    [System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {{
 {4}
+    }}
 }}
-
-
-", 
-vars.AssemblySemVer,
- vars.MajorMinorPatch + ".0", 
- vars.InformationalVersion,
-            vars.CommitDate,
-            GenerateVariableMembers(vars));
+",
+        vars.AssemblySemVer,
+        vars.MajorMinorPatch + ".0",
+        vars.InformationalVersion,
+        vars.CommitDate,
+        GenerateVariableMembers(vars),
+        assemblyName);
 
         return assemblyInfo;
     }
@@ -48,10 +50,9 @@ string GenerateVariableMembers(IEnumerable<KeyValuePair<string, string>> vars)
         var members = new StringBuilder();
         foreach (var variable in vars)
         {
-            members.AppendLine(string.Format("    public static string {0} = \"{1}\";", variable.Key, variable.Value));
+            members.AppendLine(string.Format("        public static string {0} = \"{1}\";", variable.Key, variable.Value));
         }
 
         return members.ToString();
     }
-
 }
\ No newline at end of file
diff --git a/src/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs b/src/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs
index 0f6a45f70a..1f27b2112b 100644
--- a/src/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs
+++ b/src/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs
@@ -69,7 +69,7 @@ public void InnerExecute()
             TempFileTracker.DeleteTempFiles();
 
             InvalidFileChecker.CheckForInvalidFiles(CompileFiles, ProjectFile);
-            
+
             VersionVariables versionVariables;
             if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out versionVariables, NoFetch, new Authentication(), fileSystem))
             {
@@ -80,7 +80,6 @@ public void InnerExecute()
 
         void CreateTempAssemblyInfo(VersionVariables versionVariables)
         {
-
             if (IntermediateOutputPath == null)
             {
                 var tempFileName = string.Format("AssemblyInfo_{0}_{1}.g.cs", Path.GetFileNameWithoutExtension(ProjectFile), Path.GetRandomFileName());
@@ -92,8 +91,8 @@ void CreateTempAssemblyInfo(VersionVariables versionVariables)
             }
 
             var assemblyInfoBuilder = new AssemblyInfoBuilder();
-            var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables);
+            var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables, Path.GetFileNameWithoutExtension(ProjectFile));
             File.WriteAllText(AssemblyInfoTempFilePath, assemblyInfo);
         }
     }
-}
+}
\ No newline at end of file