Index: SQLite.Interop/SQLite.Interop.2008.vcproj
==================================================================
--- SQLite.Interop/SQLite.Interop.2008.vcproj
+++ SQLite.Interop/SQLite.Interop.2008.vcproj
@@ -8,11 +8,11 @@
  *
 -->
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="SQLite.Interop"
+	Name="SQLite.Interop.2008"
 	ProjectGUID="{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
 	RootNamespace="SQLite.Interop"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -74,21 +74,24 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="$(INTEROP_ASSEMBLY_RESOURCES)"
 				AdditionalDependencies="$(ProjectDir)..\bin\$(ConfigurationName)Module\bin\System.Data.SQLite.netmodule"
+				OutputFile="$(OutDir)\$(INTEROP_MIXED_NAME).dll"
 				Version="$(INTEROP_MANIFEST_VERSION)"
 				LinkIncremental="1"
 				ModuleDefinitionFile="src\core\sqlite3.def"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
+				ProgramDatabaseFile="$(TargetDir)$(INTEROP_MIXED_NAME).pdb"
 				GenerateMapFile="true"
 				MapExports="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				LinkTimeCodeGeneration="1"
+				ImportLibrary="$(TargetDir)$(INTEROP_MIXED_NAME).lib"
 				TargetMachine="1"
 				CLRUnmanagedCodeCheck="true"
 				KeyFile="$(INTEROP_KEY_FILE)"
 				DelaySign="true"
 			/>
@@ -104,20 +107,21 @@
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)/$(INTEROP_MIXED_NAME).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(TargetPath)&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
+				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(OutDir)\$(INTEROP_MIXED_NAME).dll&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(ProjectDir)..\bin\$(PlatformName)\$(ConfigurationName)"
@@ -170,21 +174,24 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="$(INTEROP_ASSEMBLY_RESOURCES)"
 				AdditionalDependencies="$(ProjectDir)..\bin\$(ConfigurationName)Module\bin\System.Data.SQLite.netmodule"
+				OutputFile="$(OutDir)\$(INTEROP_MIXED_NAME).dll"
 				Version="$(INTEROP_MANIFEST_VERSION)"
 				LinkIncremental="1"
 				ModuleDefinitionFile="src\core\sqlite3.def"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)$(INTEROP_MIXED_NAME).pdb"
 				GenerateMapFile="true"
 				MapExports="true"
 				SubSystem="2"
 				LargeAddressAware="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				LinkTimeCodeGeneration="1"
+				ImportLibrary="$(TargetDir)$(INTEROP_MIXED_NAME).lib"
 				TargetMachine="1"
 				CLRUnmanagedCodeCheck="true"
 				KeyFile="$(INTEROP_KEY_FILE)"
 				DelaySign="true"
 			/>
@@ -200,20 +207,21 @@
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)/$(INTEROP_MIXED_NAME).bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(TargetPath)&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
+				CommandLine="&quot;$(FrameworkSDKDir)Bin\sn.exe&quot; -Ra &quot;$(OutDir)\$(INTEROP_MIXED_NAME).dll&quot; &quot;$(INTEROP_KEY_FILE)&quot;"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -341,22 +349,22 @@
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCManagedResourceCompilerTool"
-						ResourceFileName="$(IntDir)\System.Data.SQLite.$(InputName).resources"
+						ResourceFileName="$(IntDir)\$(INTEROP_MIXED_NAME).$(InputName).resources"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCManagedResourceCompilerTool"
-						ResourceFileName="$(IntDir)\System.Data.SQLite.$(InputName).resources"
+						ResourceFileName="$(IntDir)\$(INTEROP_MIXED_NAME).$(InputName).resources"
 					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>

Index: SQLite.Interop/SQLite.Interop.2010.vcxproj
==================================================================
--- SQLite.Interop/SQLite.Interop.2010.vcxproj
+++ SQLite.Interop/SQLite.Interop.2010.vcxproj
@@ -17,28 +17,30 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>SQLite.Interop</ProjectName>
+    <ProjectName>SQLite.Interop.2010</ProjectName>
     <ProjectGuid>{53784BC1-A8BC-4AC8-8A3E-158D6807345A}</ProjectGuid>
     <RootNamespace>SQLite.Interop</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="props\sqlite3.props" />
+  <Import Project="props\SQLite.Interop.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <TargetName>$(INTEROP_MIXED_NAME)</TargetName>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <TargetName>$(INTEROP_MIXED_NAME)</TargetName>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="props\sqlite3.props" />
-  <Import Project="props\SQLite.Interop.props" />
   <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir>$(ProjectDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>..\obj\$(Platform)\$(Configuration)\</IntDir>

Index: SQLite.Interop/props/SQLite.Interop.props
==================================================================
--- SQLite.Interop/props/SQLite.Interop.props
+++ SQLite.Interop/props/SQLite.Interop.props
@@ -11,10 +11,12 @@
   <PropertyGroup Label="UserMacros">
     <INTEROP_MANIFEST_VERSION>1.0.67.0</INTEROP_MANIFEST_VERSION>
     <INTEROP_RC_VERSION>1,0,67,0</INTEROP_RC_VERSION>
     <INTEROP_ASSEMBLY_RESOURCES>/ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteCommand.bmp,System.Data.SQLite.SQLiteCommand.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteConnection.bmp,System.Data.SQLite.SQLiteConnection.bmp /ASSEMBLYRESOURCE:..\System.Data.SQLite\SQLiteDataAdapter.bmp,System.Data.SQLite.SQLiteDataAdapter.bmp</INTEROP_ASSEMBLY_RESOURCES>
     <INTEROP_KEY_FILE>$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk</INTEROP_KEY_FILE>
+    <INTEROP_NATIVE_NAME>SQLite.Interop</INTEROP_NATIVE_NAME>
+    <INTEROP_MIXED_NAME>System.Data.SQLite</INTEROP_MIXED_NAME>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemGroup>
@@ -32,7 +34,15 @@
     </BuildMacro>
     <BuildMacro Include="INTEROP_KEY_FILE">
       <Value>$(INTEROP_KEY_FILE)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
+    <BuildMacro Include="INTEROP_NATIVE_NAME">
+      <Value>$(INTEROP_NATIVE_NAME)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="INTEROP_MIXED_NAME">
+      <Value>$(INTEROP_MIXED_NAME)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
   </ItemGroup>
 </Project>

Index: SQLite.Interop/props/SQLite.Interop.vsprops
==================================================================
--- SQLite.Interop/props/SQLite.Interop.vsprops
+++ SQLite.Interop/props/SQLite.Interop.vsprops
@@ -30,6 +30,16 @@
 	<UserMacro
 		Name="INTEROP_KEY_FILE"
 		Value="$(ProjectDir)..\System.Data.SQLite\System.Data.SQLite.snk"
 		PerformEnvironmentSet="true"
 	/>
+	<UserMacro
+		Name="INTEROP_NATIVE_NAME"
+		Value="SQLite.Interop"
+		PerformEnvironmentSet="true"
+	/>
+	<UserMacro
+		Name="INTEROP_MIXED_NAME"
+		Value="System.Data.SQLite"
+		PerformEnvironmentSet="true"
+	/>
 </VisualStudioPropertySheet>

Index: SQLite.NET.2008.sln
==================================================================
--- SQLite.NET.2008.sln
+++ SQLite.NET.2008.sln
@@ -6,11 +6,11 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Compact.2008", "System.Data.SQLite\System.Data.SQLite.Compact.2008.csproj", "{AC139951-261A-4463-B6FA-AEBC25283A66}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.2008", "test\test.2008.csproj", "{E27B1B1E-19C0-45E8-AA74-B6E1C041A130}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop", "SQLite.Interop\SQLite.Interop.2008.vcproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.2008", "SQLite.Interop\SQLite.Interop.2008.vcproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66}
 	EndProjectSection
 EndProject
 Global

Index: SQLite.NET.2010.sln
==================================================================
--- SQLite.NET.2010.sln
+++ SQLite.NET.2010.sln
@@ -4,11 +4,11 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SQLite.Module.2010", "System.Data.SQLite\System.Data.SQLite.Module.2010.csproj", "{AC139952-261A-4463-B6FA-AEBC25284A66}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test.2010", "test\test.2010.csproj", "{E27B1B1E-19C0-45E8-AA74-B6E1C041A130}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop", "SQLite.Interop\SQLite.Interop.2010.vcxproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite.Interop.2010", "SQLite.Interop\SQLite.Interop.2010.vcxproj", "{53784BC1-A8BC-4AC8-8A3E-158D6807345A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AC139952-261A-4463-B6FA-AEBC25284A66} = {AC139952-261A-4463-B6FA-AEBC25284A66}
 	EndProjectSection
 EndProject
 Global