diff --git a/Spring.Net.2008.sln b/Spring.Net.2008.sln
index c39f1387..3c50eba9 100644
--- a/Spring.Net.2008.sln
+++ b/Spring.Net.2008.sln
@@ -66,13 +66,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz20.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz20.Tests.2008", "test\Spring\Spring.Scheduling.Quartz20.Tests\Spring.Scheduling.Quartz20.Tests.2008.csproj", "{47E7DF97-2515-4F2F-BBFD-0A4C205800DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH32.2008", "src\Spring\Spring.ConversationWA.NH32\Spring.ConversationWA.NH32.2008.csproj", "{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate32.2008", "src\Spring\Spring.Web.Conversation.NHibernate32\Spring.Web.Conversation.NHibernate32.2008.csproj", "{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH33.2008", "src\Spring\Spring.ConversationWA.NH33\Spring.ConversationWA.NH33.2008.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.2008", "src\Spring\Spring.Web.Conversation.NHibernate33\Spring.Web.Conversation.NHibernate33.2008.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH32.Tests.2008", "test\Spring\Spring.ConversationWA.NH32.Tests\Spring.ConversationWA.NH32.Tests.2008.csproj", "{2FB16852-22AD-4A5B-885A-97136265CC46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate32.Tests.2008", "test\Spring\Spring.Web.Conversation.NHibernate32.Tests\Spring.Web.Conversation.NHibernate32.Tests.2008.csproj", "{2FB16852-22AD-4A5B-885A-97136265CC46}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH33.Tests.2008", "test\Spring\Spring.ConversationWA.NH33.Tests\Spring.ConversationWA.NH33.Tests.2008.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.Tests.2008", "test\Spring\Spring.Web.Conversation.NHibernate33.Tests\Spring.Web.Conversation.NHibernate33.Tests.2008.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Spring.Net.2010.sln b/Spring.Net.2010.sln
index f1e3e407..895e55c3 100644
--- a/Spring.Net.2010.sln
+++ b/Spring.Net.2010.sln
@@ -93,13 +93,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Messaging.Nms.Integr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Scheduling.Quartz20.Integration.Tests.2010", "test\Spring\Spring.Scheduling.Quartz20.Integration.Tests\Spring.Scheduling.Quartz20.Integration.Tests.2010.csproj", "{8CF0F34A-CC93-4D87-AE14-A2DEEF072F26}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH32.2010", "src\Spring\Spring.ConversationWA.NH32\Spring.ConversationWA.NH32.2010.csproj", "{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate32.2010", "src\Spring\Spring.Web.Conversation.NHibernate32\Spring.Web.Conversation.NHibernate32.2010.csproj", "{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH33.2010", "src\Spring\Spring.ConversationWA.NH33\Spring.ConversationWA.NH33.2010.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.2010", "src\Spring\Spring.Web.Conversation.NHibernate33\Spring.Web.Conversation.NHibernate33.2010.csproj", "{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH32.Tests.2010", "test\Spring\Spring.ConversationWA.NH32.Tests\Spring.ConversationWA.NH32.Tests.2010.csproj", "{2FB16852-22AD-4A5B-885A-97136265CC46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate32.Tests.2010", "test\Spring\Spring.Web.Conversation.NHibernate32.Tests\Spring.Web.Conversation.NHibernate32.Tests.2010.csproj", "{2FB16852-22AD-4A5B-885A-97136265CC46}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.ConversationWA.NH33.Tests.2010", "test\Spring\Spring.ConversationWA.NH33.Tests\Spring.ConversationWA.NH33.Tests.2010.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Web.Conversation.NHibernate33.Tests.2010", "test\Spring\Spring.Web.Conversation.NHibernate33.Tests\Spring.Web.Conversation.NHibernate33.Tests.2010.csproj", "{C57B05EA-FD1A-40EC-BB60-D2E45AB1A86A}"
 EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
diff --git a/Spring.build b/Spring.build
index 3cd7fe7c..6e394036 100644
--- a/Spring.build
+++ b/Spring.build
@@ -418,8 +418,8 @@ Commandline Examples:
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
     <nant buildfile="src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build" target="build" if="${build-velocity}"/>
     <!--"Spring.ConversationWA.NH*.dll" should be at last to prevent the other assemblies are compiled with reference to this-->
-    <nant buildfile="src/Spring/Spring.ConversationWA.NH32/Spring.ConversationWA.NH32.build" target="build" if="${build-conversation}"/>
-    <nant buildfile="src/Spring/Spring.ConversationWA.NH33/Spring.ConversationWA.NH33.build" target="build" if="${build-conversation}"/>
+    <nant buildfile="src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build" target="build" if="${build-conversation}"/>
+    <nant buildfile="src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build" target="build" if="${build-conversation}"/>
 
     <!-- test assemblies -->
     
@@ -448,8 +448,8 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
     <nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/>
     <!--"Spring.ConversationWA.NH*.Tests.dll" should be at last to prevent the other tests are compiled with reference to this-->
-    <nant buildfile="test/Spring/Spring.ConversationWA.NH32.Tests/Spring.ConversationWA.NH32.Tests.build" target="test" if="${build-conversation}"/>
-    <nant buildfile="test/Spring/Spring.ConversationWA.NH33.Tests/Spring.ConversationWA.NH33.Tests.build" target="test" if="${build-conversation}"/>
+    <nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build" target="test" if="${build-conversation}"/>
+    <nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build" target="test" if="${build-conversation}"/>
 
     <!-- Main solutions and examples are compiled via task build-solutions -->
 
@@ -686,8 +686,8 @@ Commandline Examples:
         <delete dir="src/Spring/Spring.Testing.Microsoft/obj" failonerror="false"/>
         <delete dir="src/Spring/Spring.Testing.Microsoft/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web/obj" failonerror="false"/>
-        <delete dir="src/Spring/Spring.ConversationWA.NH32/obj" failonerror="false"/>
-        <delete dir="src/Spring/Spring.ConversationWA.NH32/bin" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Web.Conversation.NHibernate32/obj" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Web.Conversation.NHibernate32/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Extensions/obj" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Extensions/bin" failonerror="false"/>
@@ -697,10 +697,10 @@ Commandline Examples:
         <delete dir="src/Spring/Spring.Web.Mvc3/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Mvc4/obj" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Mvc4/bin" failonerror="false"/>        
-        <delete dir="src/Spring/Spring.ConversationWA.NH32/obj" failonerror="false"/>
-        <delete dir="src/Spring/Spring.ConversationWA.NH32/bin" failonerror="false"/>
-        <delete dir="src/Spring/Spring.ConversationWA.NH33/obj" failonerror="false"/>
-        <delete dir="src/Spring/Spring.ConversationWA.NH33/bin" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Web.Conversation.NHibernate32/obj" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Web.Conversation.NHibernate32/bin" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Web.Conversation.NHibernate33/obj" failonerror="false"/>
+        <delete dir="src/Spring/Spring.Web.Conversation.NHibernate33/bin" failonerror="false"/>
         
         <delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/obj" failonerror="false"/>
         <delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/bin" failonerror="false"/>
@@ -751,14 +751,14 @@ Commandline Examples:
         <delete dir="test/Spring/Spring.Testing.NUnit.Tests/bin" failonerror="false"/>
         
         <delete failonerror="false">
-          <fileset basedir="test/Spring/Spring.ConversationWA.NH32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Bin">
+          <fileset basedir="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Bin">
             <include name="*.dll"/> 
             <include name="*.xml"/> 
             <include name="*.pdb"/> 
           </fileset>           
         </delete>   
         <delete failonerror="false">
-          <fileset basedir="test/Spring/Spring.ConversationWA.NH33.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Bin">
+          <fileset basedir="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Data/Spring/ConversationWA/WebConversationStateTest/Bin">
             <include name="*.dll"/> 
             <include name="*.xml"/> 
             <include name="*.pdb"/> 
@@ -782,10 +782,10 @@ Commandline Examples:
         <delete dir="test/Spring/Spring.Web.Mvc4.Tests/obj"  failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc4.Tests/bin"  failonerror="false"/> 
         
-        <delete dir="test/Spring/Spring.ConversationWA.NH32.Tests/obj" failonerror="false"/>
-        <delete dir="test/Spring/Spring.ConversationWA.NH32.Tests/bin" failonerror="false"/>
-        <delete dir="test/Spring/Spring.ConversationWA.NH33.Tests/obj" failonerror="false"/>
-        <delete dir="test/Spring/Spring.ConversationWA.NH33.Tests/bin" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/obj" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/bin" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/obj" failonerror="false"/>
+        <delete dir="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/bin" failonerror="false"/>
 
         <delete dir="examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/bin" failonerror="false"/>
         <delete dir="examples/Spring/Spring.CachingQuickStart/src/Spring.CachingQuickStart.Web/obj" failonerror="false"/>
@@ -1419,13 +1419,13 @@ Commandline Examples:
           <include name="*/*/Spring.Template.Velocity.xml"/>
           <include name="*/*/Spring.Template.Velocity.pdb"/>
 
-          <include name="*/*/Spring.ConversationWA.NH32.dll"/>
-          <include name="*/*/Spring.ConversationWA.NH32.xml"/>
-          <include name="*/*/Spring.ConversationWA.NH32.pdb"/>
+          <include name="*/*/Spring.Web.Conversation.NHibernate32.dll"/>
+          <include name="*/*/Spring.Web.Conversation.NHibernate32.xml"/>
+          <include name="*/*/Spring.Web.Conversation.NHibernate32.pdb"/>
           
-          <include name="*/*/Spring.ConversationWA.NH33.dll"/>
-          <include name="*/*/Spring.ConversationWA.NH33.xml"/>
-          <include name="*/*/Spring.ConversationWA.NH33.pdb"/>
+          <include name="*/*/Spring.Web.Conversation.NHibernate33.dll"/>
+          <include name="*/*/Spring.Web.Conversation.NHibernate33.xml"/>
+          <include name="*/*/Spring.Web.Conversation.NHibernate33.pdb"/>
 
         </fileset>
       </copy>
@@ -1655,8 +1655,8 @@ Commandline Examples:
       <include name="src/Spring/Spring.Testing.NUnit/**"/>
       <include name="src/Spring/Spring.Testing.Microsoft/**"/>
       <include name="src/Spring/CommonAssemblyInfo.cs"/>
-      <include name="src/Spring/Spring.ConversationWA.NH32/**"/>
-      <include name="src/Spring/Spring.ConversationWA.NH33/**"/>
+      <include name="src/Spring/Spring.Web.Conversation.NHibernate32/**"/>
+      <include name="src/Spring/Spring.Web.Conversation.NHibernate33/**"/>
 
       <include name="test/Spring/Spring.Core.Tests/**"/>
       <include name="test/Spring/Spring.Aop.Tests/**"/>
@@ -1680,8 +1680,8 @@ Commandline Examples:
       <include name="test/Spring/Spring.Testing.NUnit.Tests/**"/>
       <include name="test/Spring/Spring.Testing.Microsoft.Tests/**"/>
       <include name="test/Spring/CommonAssemblyInfo.cs"/>
-      <include name="test/Spring/Spring.ConversationWA.NH32.Tests/**"/>
-      <include name="test/Spring/Spring.ConversationWA.NH33.Tests/**"/>
+      <include name="test/Spring/Spring.Web.Conversation.NHibernate32.Tests/**"/>
+      <include name="test/Spring/Spring.Web.Conversation.NHibernate33.Tests/**"/>
 
       <include name="examples/Spring/Spring.Examples.build"/>
       <include name="examples/Spring/Spring.AopQuickStart/**"/>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2008.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2008.csproj
index 5a8403d6..cef7c526 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2008.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2008.csproj
@@ -54,9 +54,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.ConversationWA.NH32, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Spring.Web.Conversation.NHibernate32, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.ConversationWA.NH32.dll</HintPath>
+      <HintPath>..\..\..\..\..\bin\net\3.5\debug\Spring.Web.Conversation.NHibernate32.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2010.csproj b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2010.csproj
index 2d65b1fb..bbae66ef 100644
--- a/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2010.csproj
+++ b/examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Web.ConvWA/Spring.Northwind.Web.ConvWA.2010.csproj
@@ -60,8 +60,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll</HintPath>
     </Reference>
-    <Reference Include="Spring.ConversationWA.NH32">
-      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.ConversationWA.NH32.dll</HintPath>
+    <Reference Include="Spring.Web.Conversation.NHibernate32">
+      <HintPath>..\..\..\..\..\bin\net\4.0\debug\Spring.Web.Conversation.NHibernate32.dll</HintPath>
     </Reference>
     <Reference Include="Spring.Core, Version=0.0.0.35000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.2008.csproj b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
similarity index 96%
rename from src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.2008.csproj
rename to src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
index 8113f9dc..1c87dc7a 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.2008.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2008.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH32</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate32</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -22,7 +22,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.ConversationWA.NH32\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate32\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.2010.csproj b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj
similarity index 96%
rename from src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.2010.csproj
rename to src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj
index f900d5c7..874921c3 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.2010.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.2010.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH32</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate32</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2010\Spring.ConversationWA.NH32\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate32\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.build b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
similarity index 92%
rename from src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.build
rename to src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
index 2705e10d..e330833a 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.ConversationWA.NH32.build
+++ b/src/Spring/Spring.Web.Conversation.NHibernate32/Spring.Web.Conversation.NHibernate32.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.ConversationWA.NH32" default="build" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
+<project name="Spring.Web.Conversation.NHibernate32" default="build" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
 <!--
     Required properties:
       * current.bin.dir           - (path) root level to build to
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.2008.csproj b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
similarity index 79%
rename from src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.2008.csproj
rename to src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
index 995c9f88..12e0e544 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.2008.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2008.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH33</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate33</AssemblyName>
     <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkSubset>
@@ -19,11 +19,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.ConversationWA.NH33\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate33\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Spring.ConversationWA.NH33.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Spring.Web.Conversation.NHibernate33.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -55,28 +55,28 @@
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\HttpModule\ConversationModule.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\HttpModule\ConversationModule.cs">
       <Link>Conversation\HttpModule\ConversationModule.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\IConversationManager.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationManager.cs">
       <Link>Conversation\IConversationManager.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\IConversationState.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationState.cs">
       <Link>Conversation\IConversationState.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\Imple\InnerConversationList.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Imple\InnerConversationList.cs">
       <Link>Conversation\Imple\InnerConversationList.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\Imple\WebConversationManager.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Imple\WebConversationManager.cs">
       <Link>Conversation\Imple\WebConversationManager.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\Imple\WebConversationSpringState.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Imple\WebConversationSpringState.cs">
       <Link>Conversation\Imple\WebConversationSpringState.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\Data\NHibernate\Support\SessionPerConversationScope.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationScope.cs">
       <Link>Data\NHibernate\Support\SessionPerConversationScope.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
       <Link>Data\NHibernate\Support\SessionPerConversationSettings.cs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.2010.csproj b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj
similarity index 79%
rename from src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.2010.csproj
rename to src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj
index 5be4c7ea..a2b69ff5 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.2010.csproj
+++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.2010.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH33</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate33</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
@@ -21,11 +21,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2010\Spring.ConversationWA.NH33\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate33\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Spring.ConversationWA.NH33.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Spring.Web.Conversation.NHibernate33.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -57,28 +57,28 @@
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\HttpModule\ConversationModule.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\HttpModule\ConversationModule.cs">
       <Link>Conversation\HttpModule\ConversationModule.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\IConversationManager.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationManager.cs">
       <Link>Conversation\IConversationManager.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\IConversationState.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\IConversationState.cs">
       <Link>Conversation\IConversationState.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\Impl\InnerConversationList.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\InnerConversationList.cs">
       <Link>Conversation\Impl\InnerConversationList.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\Impl\WebConversationManager.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\WebConversationManager.cs">
       <Link>Conversation\Impl\WebConversationManager.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\ConversationWA\Impl\WebConversationSpringState.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\ConversationWA\Impl\WebConversationSpringState.cs">
       <Link>Conversation\Impl\WebConversationSpringState.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\Data\NHibernate\Support\SessionPerConversationScope.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationScope.cs">
       <Link>Data\NHibernate\Support\SessionPerConversationScope.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32\Data\NHibernate\Support\SessionPerConversationSettings.cs">
       <Link>Data\NHibernate\Support\SessionPerConversationSettings.cs</Link>
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
diff --git a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.build b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
similarity index 84%
rename from src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.build
rename to src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
index a4773863..01449078 100644
--- a/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.ConversationWA.NH33.build
+++ b/src/Spring/Spring.Web.Conversation.NHibernate33/Spring.Web.Conversation.NHibernate33.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.ConversationWA.NH33" default="build" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
+<project name="Spring.Web.Conversation.NHibernate33" default="build" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
 <!--
     Required properties:
       * current.bin.dir           - (path) root level to build to
@@ -29,9 +29,9 @@
 			</nowarn>
 			<sources failonempty="true">
         <include name="**/*.cs" />
-        <include name="../Spring.ConversationWA.NH32/**/*.cs" />
+        <include name="../Spring.Web.Conversation.NHibernate32/**/*.cs" />
 				<include name="../GenCommonAssemblyInfo.cs" />
-        <exclude name="../Spring.ConversationWA.NH32/AssemblyInfo.cs"/>
+        <exclude name="../Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs"/>
 			</sources>
 			<references basedir="${current.bin.dir}">
 				<include name="System.Data.dll" />
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.2008.csproj b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj
similarity index 92%
rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.2008.csproj
rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj
index 518927bc..760e8a7d 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.2008.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2008.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH32.Tests</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate32.Tests</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -22,11 +22,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.ConversationWA.NH32.Tests\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate32.Tests\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\VS.Net.2008\Spring.ConversationWA.NH32.Tests\Debug\Spring.ConversationWA.NH32.Tests.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate32.Tests\Debug\Spring.Web.Conversation.NHibernate32.Tests.XML</DocumentationFile>
     <StartAction>Program</StartAction>
     <StartProgram>$(MSBuildProjectDirectory)\..\..\dependencies\tools\NUnit-2.6.0.12051\bin\nunit-x86.exe</StartProgram>
     <StartArguments>"$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).dll"</StartArguments>
@@ -94,9 +94,9 @@
       <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
       <Name>Spring.Aop.2008</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.ConversationWA.NH32\Spring.ConversationWA.NH32.2008.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate32\Spring.Web.Conversation.NHibernate32.2008.csproj">
       <Project>{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}</Project>
-      <Name>Spring.ConversationWA.NH32.2008</Name>
+      <Name>Spring.Web.Conversation.NHibernate32.2008</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
similarity index 96%
rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.2010.csproj
rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
index 8f0ea12c..75208d59 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.2010.csproj
@@ -9,14 +9,14 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH32.Tests</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate32.Tests</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.ConversationWA.NH32.Tests/</PublishUrl>
+    <PublishUrl>http://localhost/Spring.Web.Conversation.NHibernate32.Tests/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -36,11 +36,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2010\Spring.ConversationWA.NH32.Tests\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate32.Tests\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\VS.Net.2010\Spring.ConversationWA.NH32.Tests\Debug\Spring.ConversationWA.NH32.Tests.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate32.Tests\Debug\Spring.Web.Conversation.NHibernate32.Tests.XML</DocumentationFile>
     <StartAction>Program</StartAction>
     <StartProgram>$(MSBuildProjectDirectory)\..\..\dependencies\tools\NUnit-2.6.0.12051\bin\nunit-x86.exe</StartProgram>
     <StartArguments>"$(MSBuildProjectDirectory)\$(OutputPath)\$(AssemblyName).dll"</StartArguments>
@@ -196,9 +196,9 @@
       <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
       <Name>Spring.Aop.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.ConversationWA.NH32\Spring.ConversationWA.NH32.2010.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate32\Spring.Web.Conversation.NHibernate32.2010.csproj">
       <Project>{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}</Project>
-      <Name>Spring.ConversationWA.NH32.2010</Name>
+      <Name>Spring.Web.Conversation.NHibernate32.2010</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.build b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build
similarity index 93%
rename from test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.build
rename to test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build
index 0c5b7ab3..3b66f442 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.ConversationWA.NH32.Tests.build
+++ b/test/Spring/Spring.Web.Conversation.NHibernate32.Tests/Spring.Web.Conversation.NHibernate32.Tests.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.ConversationWA.NH32.Tests" default="test" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
+<project name="Spring.Web.Conversation.NHibernate32.Tests" default="test" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
 
   <include buildfile="${spring.basedir}/common-project.include" />
 
@@ -44,7 +44,7 @@
         <exclude name="Spring.Data.NHibernate2*.dll" />
         <exclude name="Spring.Data.NHibernate30*.dll" />
         <exclude name="Spring.Data.NHibernate33*.dll" />
-        <exclude name="Spring.ConversationWA.NH33*.dll" />
+        <exclude name="Spring.Web.Conversation.NHibernate33*.dll" />
         <exclude name="Spring.Data.NHibernate*Tests*.dll" />
         <exclude name="CloverRuntime.dll" />
         <exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
@@ -82,7 +82,7 @@
     <move todir="${current.bin.dir}/nunitaspex_excluded" failonerror="true">
       <fileset basedir="${current.bin.dir}">
         <include name="Spring.Data.NHibernate33.dll"/>
-        <include name="Spring.ConversationWA.NH33*.dll"/>
+        <include name="Spring.Web.Conversation.NHibernate33*.dll"/>
       </fileset>
     </move>
 
@@ -109,7 +109,7 @@
     <move todir="${current.bin.dir}">
       <fileset basedir="${current.bin.dir}/nunitaspex_excluded">
         <include name="Spring.Data.NHibernate33.dll"/>
-        <include name="Spring.ConversationWA.NH33*.dll"/>
+        <include name="Spring.Web.Conversation.NHibernate33*.dll"/>
       </fileset>
     </move>
   </target>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.2008.csproj b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj
similarity index 78%
rename from test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.2008.csproj
rename to test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj
index b26c3706..2534e569 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.2008.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2008.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH33.Tests</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate33.Tests</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -22,7 +22,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2008\Spring.ConversationWA.NH33.Tests\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2008\Spring.Web.Conversation.NHibernate33.Tests\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -68,7 +68,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Spring.ConversationWA.NH32.Tests\lib\net\2.0\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\Spring.Web.Conversation.NHibernate32.Tests\lib\net\2.0\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
@@ -77,39 +77,39 @@
     <Compile Include="..\..\..\src\Spring\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\ConversationEvidenceBsnImpl.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\ConversationEvidenceBsnImpl.cs">
       <Link>Bsn\ConversationEvidenceBsnImpl.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\IConversationEvidenceBsn.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\IConversationEvidenceBsn.cs">
       <Link>Bsn\IConversationEvidenceBsn.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\INoDeferedErrorBsn.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\INoDeferedErrorBsn.cs">
       <Link>Bsn\INoDeferedErrorBsn.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\NoDeferedErrorBsnImpl.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\NoDeferedErrorBsnImpl.cs">
       <Link>Bsn\NoDeferedErrorBsnImpl.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\PatialEndConvBeginBasePage.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\PatialEndConvBeginBasePage.cs">
       <Link>ConversationWA\PatialEndConvBeginBasePage.cs</Link>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\PatialEndConvEndBasePage.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\PatialEndConvEndBasePage.cs">
       <Link>ConversationWA\PatialEndConvEndBasePage.cs</Link>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\SerializeConversationTestModule.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\SerializeConversationTestModule.cs">
       <Link>ConversationWA\SerializeConversationTestModule.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\WebConversationStateTest.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\WebConversationStateTest.cs">
       <Link>ConversationWA\WebConversationStateTest.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Entities\SPCDetailEnt.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Entities\SPCDetailEnt.cs">
       <Link>Entities\SPCDetailEnt.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Entities\SPCMasterEnt.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Entities\SPCMasterEnt.cs">
       <Link>Entities\SPCMasterEnt.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Spring\Data\Common\CountGetConnDbProvider.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Spring\Data\Common\CountGetConnDbProvider.cs">
       <Link>Spring\Data\Common\CountGetConnDbProvider.cs</Link>
     </Compile>
   </ItemGroup>
@@ -118,9 +118,9 @@
       <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
       <Name>Spring.Aop.2008</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.ConversationWA.NH33\Spring.ConversationWA.NH33.2008.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate33\Spring.Web.Conversation.NHibernate33.2008.csproj">
       <Project>{64400FF8-2E9F-4809-B5F4-0C7EB8ABFF87}</Project>
-      <Name>Spring.ConversationWA.NH33.2008</Name>
+      <Name>Spring.Web.Conversation.NHibernate33.2008</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2008.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
@@ -148,7 +148,7 @@
     <EmbeddedResource Include="Entities\SPCMasterEnt.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\Spring.ConversationWA.NH32.Tests\Data\Spring\ConversationWA\WebConversationStateTest\log4net.config">
+    <None Include="..\Spring.Web.Conversation.NHibernate32.Tests\Data\Spring\ConversationWA\WebConversationStateTest\log4net.config">
       <Link>Data\Spring\ConversationWA\WebConversationStateTest\log4net.config</Link>
     </None>
     <None Include="app.config" />
@@ -168,7 +168,7 @@
   <PropertyGroup>
     <PostBuildEvent>echo "Copying TestWebs to output directory"
 rd /S /Q "$(TargetDir)Data"
-xcopy "$(ProjectDir)..\Spring.ConversationWA.NH32.Tests\Data" "$(TargetDir)Data\" /y /s
+xcopy "$(ProjectDir)..\Spring.Web.Conversation.NHibernate32.Tests\Data" "$(TargetDir)Data\" /y /s
 xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s
 rd /S /Q "$(TargetDir)Data\Spring\ConversationWA\WebConversationStateTest\Bin"
 </PostBuildEvent>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.2010.csproj b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
similarity index 81%
rename from test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.2010.csproj
rename to test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
index 0c79a089..da5c0a6f 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.2010.csproj
+++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.2010.csproj
@@ -9,14 +9,14 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spring</RootNamespace>
-    <AssemblyName>Spring.ConversationWA.NH33.Tests</AssemblyName>
+    <AssemblyName>Spring.Web.Conversation.NHibernate33.Tests</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <PublishUrl>http://localhost/Spring.ConversationWA.NH33.Tests/</PublishUrl>
+    <PublishUrl>http://localhost/Spring.Web.Conversation.NHibernate33.Tests/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -36,7 +36,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\build\VS.Net.2010\Spring.ConversationWA.NH33.Tests\Debug\</OutputPath>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Web.Conversation.NHibernate33.Tests\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -78,7 +78,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite, Version=1.0.80.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Spring.ConversationWA.NH32.Tests\lib\net\2.0\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\Spring.Web.Conversation.NHibernate32.Tests\lib\net\2.0\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
@@ -87,36 +87,36 @@
     <Compile Include="..\..\..\src\Spring\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\ConversationEvidenceBsnImpl.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\ConversationEvidenceBsnImpl.cs">
       <Link>Bsn\ConversationEvidenceBsnImpl.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\IConversationEvidenceBsn.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\IConversationEvidenceBsn.cs">
       <Link>Bsn\IConversationEvidenceBsn.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\INoDeferedErrorBsn.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\INoDeferedErrorBsn.cs">
       <Link>Bsn\INoDeferedErrorBsn.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Bsn\NoDeferedErrorBsnImpl.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Bsn\NoDeferedErrorBsnImpl.cs">
       <Link>Bsn\NoDeferedErrorBsnImpl.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\PatialEndConvBeginBasePage.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\PatialEndConvBeginBasePage.cs">
       <Link>ConversationWA\PatialEndConvBeginBasePage.cs</Link>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\PatialEndConvEndBasePage.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\PatialEndConvEndBasePage.cs">
       <Link>ConversationWA\PatialEndConvEndBasePage.cs</Link>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\ConversationWA\WebConversationStateTest.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\ConversationWA\WebConversationStateTest.cs">
       <Link>ConversationWA\WebConversationStateTest.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Entities\SPCDetailEnt.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Entities\SPCDetailEnt.cs">
       <Link>Entities\SPCDetailEnt.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Entities\SPCMasterEnt.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Entities\SPCMasterEnt.cs">
       <Link>Entities\SPCMasterEnt.cs</Link>
     </Compile>
-    <Compile Include="..\Spring.ConversationWA.NH32.Tests\Spring\Data\Common\ConnectionCreationTrackingDbProvider.cs">
+    <Compile Include="..\Spring.Web.Conversation.NHibernate32.Tests\Spring\Data\Common\ConnectionCreationTrackingDbProvider.cs">
       <Link>Spring\Data\Common\ConnectionCreationTrackingDbProvider.cs</Link>
     </Compile>
   </ItemGroup>
@@ -125,9 +125,9 @@
       <Project>{3A3A4E65-45A6-4B20-B460-0BEDC302C02C}</Project>
       <Name>Spring.Aop.2010</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Spring\Spring.ConversationWA.NH33\Spring.ConversationWA.NH33.2010.csproj">
+    <ProjectReference Include="..\..\..\src\Spring\Spring.Web.Conversation.NHibernate33\Spring.Web.Conversation.NHibernate33.2010.csproj">
       <Project>{CF375928-B6D5-485C-B04D-2BC41D9DBF1E}</Project>
-      <Name>Spring.ConversationWA.NH33.2010</Name>
+      <Name>Spring.Web.Conversation.NHibernate33.2010</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\src\Spring\Spring.Core\Spring.Core.2010.csproj">
       <Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
@@ -156,7 +156,7 @@
     <EmbeddedResource Include="Entities\SPCMasterEnt.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\Spring.ConversationWA.NH32.Tests\Data\Spring\ConversationWA\WebConversationStateTest\log4net.config">
+    <None Include="..\Spring.Web.Conversation.NHibernate32.Tests\Data\Spring\ConversationWA\WebConversationStateTest\log4net.config">
       <Link>Data\Spring\ConversationWA\WebConversationStateTest\log4net.config</Link>
     </None>
     <None Include="app.config" />
@@ -198,7 +198,7 @@
   <PropertyGroup>
     <PostBuildEvent>echo "Copying TestWebs to output directory"
 rd /S /Q "$(TargetDir)Data"
-xcopy "$(ProjectDir)..\Spring.ConversationWA.NH32.Tests\Data" "$(TargetDir)Data\" /y /s
+xcopy "$(ProjectDir)..\Spring.Web.Conversation.NHibernate32.Tests\Data" "$(TargetDir)Data\" /y /s
 xcopy "$(ProjectDir)Data" "$(TargetDir)Data\" /y /s
 rd /S /Q "$(TargetDir)Data\Spring\ConversationWA\WebConversationStateTest\Bin"
 </PostBuildEvent>
diff --git a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.build b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build
similarity index 84%
rename from test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.build
rename to test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build
index 497bdf62..46a1a774 100644
--- a/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.ConversationWA.NH33.Tests.build
+++ b/test/Spring/Spring.Web.Conversation.NHibernate33.Tests/Spring.Web.Conversation.NHibernate33.Tests.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<project name="Spring.ConversationWA.NH33.Tests" default="test" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
+<project name="Spring.Web.Conversation.NHibernate33.Tests" default="test" xmlns="http://nant.sf.net/release/0.91-alpha2/nant.xsd">
 
   <include buildfile="${spring.basedir}/common-project.include" />
 
@@ -31,10 +31,10 @@
         <include name="../CommonAssemblyInfo.cs" />
         <exclude name="Data/**/*.*" />
         <exclude name="bin/**/*" />
-        <include name="../Spring.ConversationWA.NH32.Tests/**/*.cs" />
-        <exclude name="../Spring.ConversationWA.NH32/AssemblyInfo.cs"/>
-        <exclude name="../Spring.ConversationWA.NH32.Tests/Data/**/*.*" />
-        <exclude name="../Spring.ConversationWA.NH32.Tests/bin/**/*" />
+        <include name="../Spring.Web.Conversation.NHibernate32.Tests/**/*.cs" />
+        <exclude name="../Spring.Web.Conversation.NHibernate32/AssemblyInfo.cs"/>
+        <exclude name="../Spring.Web.Conversation.NHibernate32.Tests/Data/**/*.*" />
+        <exclude name="../Spring.Web.Conversation.NHibernate32.Tests/bin/**/*" />
       </sources>
       <references basedir="${current.bin.dir}">
         <lib>
@@ -48,7 +48,7 @@
         <exclude name="Spring.Data.NHibernate2*.dll" />
         <exclude name="Spring.Data.NHibernate30*.dll" />
         <exclude name="Spring.Data.NHibernate32*.dll" />
-        <exclude name="Spring.ConversationWA.NH32*.dll" />
+        <exclude name="Spring.Web.Conversation.NHibernate32*.dll" />
         <exclude name="Spring.Data.NHibernate*Tests*.dll" />
         <exclude name="CloverRuntime.dll" />
         <exclude if="${net-4.0}" name="System.Web.Extensions.dll" />
@@ -67,7 +67,7 @@
     <echo message="Copying TestWebs to output directory"/>
     <delete dir="${current.bin.dir}/Data"/>
     <copy todir="${current.bin.dir}/Data">
-      <fileset basedir="${project::get-base-directory()}/../Spring.ConversationWA.NH32.Tests/Data">
+      <fileset basedir="${project::get-base-directory()}/../Spring.Web.Conversation.NHibernate32.Tests/Data">
         <include name="**/*.*" />
         <exclude name="bin/*.*" />
       </fileset>
@@ -86,7 +86,7 @@
     <move todir="${current.bin.dir}/nunitaspex_excluded" failonerror="true">
       <fileset basedir="${current.bin.dir}">
         <include name="Spring.Data.NHibernate32.dll"/>
-        <include name="Spring.ConversationWA.NH32*.dll"/>
+        <include name="Spring.Web.Conversation.NHibernate32*.dll"/>
       </fileset>
     </move>
 
@@ -94,7 +94,7 @@
     <!--temporary copies of "System.Data.SQLite.dll" because it is 32bit and causes problems in the compilation of the other test projects. It occurs in 64-bit Windows environment.-->
     <property name="no.preexisting.sqlite" value="${not file::exists('${current.bin.dir}/System.Data.SQLite.dll')}"/>
     <copy todir="${current.bin.dir}">
-      <fileset basedir="${project::get-base-directory()}/../Spring.ConversationWA.NH32.Tests/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}">
+      <fileset basedir="${project::get-base-directory()}/../Spring.Web.Conversation.NHibernate32.Tests/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}">
         <include name="System.Data.SQLite.dll" if="${no.preexisting.sqlite}"/>
       </fileset>
     </copy>
@@ -113,7 +113,7 @@
     <move todir="${current.bin.dir}">
       <fileset basedir="${current.bin.dir}/nunitaspex_excluded">
         <include name="Spring.Data.NHibernate32.dll"/>
-        <include name="Spring.ConversationWA.NH32*.dll"/>
+        <include name="Spring.Web.Conversation.NHibernate32*.dll"/>
       </fileset>
     </move>
   </target>