diff --git a/Moq.sln b/Moq.sln
index bb3c4b172..cc26131c7 100644
--- a/Moq.sln
+++ b/Moq.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Silverlight", "Silverlight"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Silverlight", "Source.Silverlight\Moq.Silverlight.csproj", "{5136C8E1-E17F-481F-B29A-C7FAB528BD2D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Tests.Silverlight", "UnitTests.Silverlight\Moq.Tests.Silverlight.csproj", "{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Silverlight.Tests", "UnitTests.Silverlight\Moq.Silverlight.Tests.csproj", "{02A2F6A6-D8CF-45EB-A424-BFD8C26034CE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
index e03b22f22..e14c5dff2 100644
--- a/Source/Properties/AssemblyInfo.cs
+++ b/Source/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 [assembly: NeutralResourcesLanguage("en")]
 
 [assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
-[assembly: InternalsVisibleTo("Moq.Tests.Silverlight, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
+[assembly: InternalsVisibleTo("Moq.Silverlight.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
 [assembly: InternalsVisibleTo("Moq.VisualStudio, PublicKey=0024000004800000940000000602000000240000525341310004000001000100137e36394ff0da41b4ba0e7d72b0296af376f1910eb713fa42c3b9f1289dad53c4a3fc0f2fcbd78f344ca00388766b6fda86f4aebff6477579dcbed7ddf52f0dd75424bea44ddc89da8e053542fda9e90bfe3e0bc51693733ee3ea96ff7a4583168f1f6e14b8f7805d2c37a58b4e5e00f6223806cfa4b6bf29b4362a99d465ab")]
 //[assembly: CLSCompliant(true)]
 
diff --git a/UnitTests.Silverlight/Moq.Tests.Silverlight.csproj b/UnitTests.Silverlight/Moq.Silverlight.Tests.csproj
similarity index 97%
rename from UnitTests.Silverlight/Moq.Tests.Silverlight.csproj
rename to UnitTests.Silverlight/Moq.Silverlight.Tests.csproj
index cd295b298..5d4714a93 100644
--- a/UnitTests.Silverlight/Moq.Tests.Silverlight.csproj
+++ b/UnitTests.Silverlight/Moq.Silverlight.Tests.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Moq.Tests</RootNamespace>
-    <AssemblyName>Moq.Tests.Silverlight</AssemblyName>
+    <AssemblyName>Moq.Silverlight.Tests</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <SilverlightApplication>true</SilverlightApplication>
     <SupportedCultures>