diff --git a/default.ps1 b/default.ps1
index b09c419b8..f36f32dae 100644
--- a/default.ps1
+++ b/default.ps1
@@ -47,26 +47,26 @@ task UpdateVersion {
 }
 
 task RunTests -depends Compile {
-	$project = "Thinktecture.IdentityServer.Core.Tests"
+	$project = "IdentityServer3.Tests"
 	mkdir $output_directory\xunit\$project -ea SilentlyContinue
 	.$xunit_path "$src_directory\Tests\UnitTests\bin\Release\$project.dll"
 }
 
 
 task ILMerge -depends Compile {
-	$input_dlls = "$output_directory\Thinktecture.IdentityServer3.dll"
+	$input_dlls = "$output_directory\IdentityServer3.dll"
 
 	Get-ChildItem -Path $output_directory -Filter *.dll |
 		foreach-object {
 			# Exclude Thinktecture.IdentityServer3.dll as that will be the primary assembly
-			if ("$_" -ne "Thinktecture.IdentityServer3.dll" -and
+			if ("$_" -ne "IdentityServer3.dll" -and
 			    "$_" -ne "Owin.dll") {
 				$input_dlls = "$input_dlls $output_directory\$_"
 			}
 	}
 
 	New-Item $dist_directory\lib\net45 -Type Directory
-	Invoke-Expression "$ilmerge_path /targetplatform:v4 /internalize /allowDup /target:library /out:$dist_directory\lib\net45\Thinktecture.IdentityServer3.dll $input_dlls"
+	Invoke-Expression "$ilmerge_path /targetplatform:v4 /internalize /allowDup /target:library /out:$dist_directory\lib\net45\IdentityServer3.dll $input_dlls"
 }
 
 task CreateNuGetPackage -depends ILMerge {
@@ -89,6 +89,6 @@ task CreateNuGetPackage -depends ILMerge {
 
 
 	copy-item $src_directory\IdentityServer3.nuspec $dist_directory
-	copy-item $output_directory\Thinktecture.IdentityServer3.xml $dist_directory\lib\net45\
+	copy-item $output_directory\IdentityServer3.xml $dist_directory\lib\net45\
 	exec { . $nuget_path pack $dist_directory\IdentityServer3.nuspec -BasePath $dist_directory -o $dist_directory -version $packageVersion }
 }
diff --git a/source/Core/Core.csproj b/source/Core/Core.csproj
index f9d67483e..52e725d75 100644
--- a/source/Core/Core.csproj
+++ b/source/Core/Core.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Thinktecture.IdentityServer.Core</RootNamespace>
-    <AssemblyName>Thinktecture.IdentityServer3</AssemblyName>
+    <AssemblyName>IdentityServer3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -21,7 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\build\Thinktecture.IdentityServer3.xml</DocumentationFile>
+    <DocumentationFile>..\..\build\IdentityServer3.xml</DocumentationFile>
     <NoWarn>
     </NoWarn>
   </PropertyGroup>
@@ -32,7 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\build\Thinktecture.IdentityServer3.xml</DocumentationFile>
+    <DocumentationFile>..\..\build\IdentityServer3.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AzureWebSites|AnyCPU'">
diff --git a/source/Core/Properties/AssemblyInfo.cs b/source/Core/Properties/AssemblyInfo.cs
index 72b7c6423..3123ae95d 100644
--- a/source/Core/Properties/AssemblyInfo.cs
+++ b/source/Core/Properties/AssemblyInfo.cs
@@ -37,4 +37,4 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("8fd81f8c-9a47-479e-9a83-bdf66f883d78")]
-[assembly: InternalsVisibleTo("Thinktecture.IdentityServer.Core.Tests")]
+[assembly: InternalsVisibleTo("IdentityServer3.Tests")]
diff --git a/source/IdentityServer3.nuspec b/source/IdentityServer3.nuspec
index 3fbdb3445..b46be30e9 100644
--- a/source/IdentityServer3.nuspec
+++ b/source/IdentityServer3.nuspec
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>Thinktecture.IdentityServer3</id>
+    <id>IdentityServer3</id>
     <version>0.0.0</version>
-    <title>Thinktecture IdentityServer3</title>
+    <title>IdentityServer3</title>
     <authors>Brock Allen, Dominick Baier</authors>
     <owners>Brock Allen, Dominick Baier</owners>
     <projectUrl>https://github.com/IdentityServer/IdentityServer3</projectUrl>
diff --git a/source/IdentityServer3.sln b/source/IdentityServer3.sln
index 49e9cb4f2..fce2f039d 100644
--- a/source/IdentityServer3.sln
+++ b/source/IdentityServer3.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{FB9E026E-BAB3-498A-A954-B93B05C146A5}"
 EndProject
diff --git a/source/Tests/UnitTests/Core.Tests.csproj b/source/Tests/UnitTests/Core.Tests.csproj
index 7a125bbf5..46ff62c33 100644
--- a/source/Tests/UnitTests/Core.Tests.csproj
+++ b/source/Tests/UnitTests/Core.Tests.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Thinktecture.IdentityServer.Tests</RootNamespace>
-    <AssemblyName>Thinktecture.IdentityServer.Core.Tests</AssemblyName>
+    <AssemblyName>IdentityServer3.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>