diff --git a/Spring.Net.2010.sln b/Spring.Net.2010.sln
index 1140a8e8..a4257dc0 100644
--- a/Spring.Net.2010.sln
+++ b/Spring.Net.2010.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F04753EF-7A1B-4837-AB63-8C0821E8155D}"
 	ProjectSection(SolutionItems) = preProject
@@ -105,7 +105,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.Tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate4.Integration.Tests\Spring.Data.NHibernate4.Integration.Tests.2010.csproj", "{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.SessionFactoryImplError.Tests", "test\Spring\Spring.SessionFactoryImplError.Tests\Spring.SessionFactoryImplError.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.TxPromotion.Integration.Tests", "test\Spring\Spring.Data.NHibernate.TxPromotion.Integration.Tests\Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/App.config b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config
similarity index 87%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/App.config
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config
index 270c7a82..c9c3a2cb 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/App.config
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/App.config
@@ -15,8 +15,8 @@
   <spring>
     <context>
       <resource uri="config://spring/objects"/>
-      <resource uri="assembly://Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests/Spring.Configuration.xml"/>
-      <resource uri="assembly://Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests/Spring.NHibernate.xml"/>
+      <resource uri="assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml"/>
+      <resource uri="assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml"/>
     </context>
     <parsers>
       <parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Container.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs
similarity index 70%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Container.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs
index c4f06edf..12c37f89 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Container.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Container.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     public class Container : IContainer
     {
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/IContainer.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs
similarity index 67%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/IContainer.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs
index c703a969..fb722eba 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/IContainer.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IContainer.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     public interface IContainer
     {
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/IService1.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs
similarity index 80%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/IService1.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs
index 29ce356a..f6513bf3 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/IService1.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService1.cs
@@ -1,4 +1,4 @@
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     public interface IService1
     {
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/IService2.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs
similarity index 67%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/IService2.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs
index 0b82a843..dcdcc723 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/IService2.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/IService2.cs
@@ -1,4 +1,4 @@
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     public interface IService2
     {
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Mappings.hbm.xml b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml
similarity index 66%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Mappings.hbm.xml
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml
index 0dc5b421..a90829b3 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Mappings.hbm.xml
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="Spring.SessionFactoryImplError.Tests" namespace="Spring.SessionFactoryImplError.Tests">
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="Spring.Data.NHibernate.TxPromotion.Integration.Tests" namespace="Spring.Data.NHibernate.TxPromotion.Integration.Tests">
 
   <class name="Container" proxy="IContainer">
     <id name="Id">
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Properties/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs
similarity index 88%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Properties/AssemblyInfo.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs
index 264dec25..2f3a8cd9 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Properties/AssemblyInfo.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Spring.SessionFactoryImplError.Tests")]
+[assembly: AssemblyTitle("Spring.Data.NHibernate.TxPromotion.Integration.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Spring.SessionFactoryImplError.Tests")]
+[assembly: AssemblyProduct("Spring.Data.NHibernate.TxPromotion.Integration.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Service1.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs
similarity index 90%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Service1.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs
index 48642c57..79c2c0b6 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Service1.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service1.cs
@@ -1,14 +1,14 @@
 using Spring.Data.NHibernate.Generic;
 using Spring.Transaction;
 
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     [Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)]
     public class Service1 : IService1
     {
         #region DI
 
-        public HibernateTemplate HibernateTemplate { get; set; }
+        public Generic.HibernateTemplate HibernateTemplate { get; set; }
 
         #endregion
 
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Service2.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs
similarity index 82%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Service2.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs
index 32b03572..b12e030e 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Service2.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Service2.cs
@@ -1,14 +1,14 @@
 using Spring.Data.NHibernate.Generic;
 using Spring.Transaction;
 
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     [Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)]
     public class Service2 : IService2
     {
         #region DI
 
-        public HibernateTemplate HibernateTemplate { get; set; }
+        public Generic.HibernateTemplate HibernateTemplate { get; set; }
 
         #endregion
 
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.Configuration.xml b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml
similarity index 83%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Spring.Configuration.xml
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml
index 7334480a..fba8c755 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.Configuration.xml
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml
@@ -26,11 +26,11 @@
     </property>
   </object>
 
-  <object id="IService1" type="Spring.SessionFactoryImplError.Tests.Service1, Spring.SessionFactoryImplError.Tests">
+  <object id="IService1" type="Spring.Data.NHibernate.TxPromotion.Integration.Tests.Service1, Spring.Data.NHibernate.TxPromotion.Integration.Tests">
     <property name="HibernateTemplate" ref="Spring.Data.NHibernate.Generic.HibernateTemplate" />
   </object>
 
-  <object id="IService2" type="Spring.SessionFactoryImplError.Tests.Service2, Spring.SessionFactoryImplError.Tests">
+  <object id="IService2" type="Spring.Data.NHibernate.TxPromotion.Integration.Tests.Service2, Spring.Data.NHibernate.TxPromotion.Integration.Tests">
     <property name="HibernateTemplate" ref="Spring.Data.NHibernate.Generic.HibernateTemplate" />
   </object>
 </objects>
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests.csproj b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj
similarity index 90%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests.csproj
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj
index 2231a6d1..5acd5252 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests.csproj
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{DE276F7C-4564-49EC-AABC-B964EC3D1626}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Spring.SessionFactoryImplError.Tests</RootNamespace>
-    <AssemblyName>Spring.SessionFactoryImplError.Tests</AssemblyName>
+    <RootNamespace>Spring.Data.NHibernate.TxPromotion.Integration.Tests</RootNamespace>
+    <AssemblyName>Spring.Data.NHibernate.TxPromotion.Integration.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -16,16 +16,16 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.TxPromotion.Integration.Tests\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\VS.Net.2010\Spring.Data.TxPromotion.Integration.Tests\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_4_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.HibernateTxScopeTransactionManager.xml b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml
similarity index 100%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Spring.HibernateTxScopeTransactionManager.xml
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.NHibernate.xml b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml
similarity index 92%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/Spring.NHibernate.xml
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml
index bf72be9c..717ca8cc 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/Spring.NHibernate.xml
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml
@@ -27,7 +27,7 @@
 
     <property name="MappingResources">
       <list>
-        <value>assembly://Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests/Mappings.hbm.xml</value>
+        <value>assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Mappings.hbm.xml</value>
       </list>
     </property>
 
diff --git a/test/Spring/Spring.SessionFactoryImplError.Tests/TestUsingHibernateTxScopeTransactionManager.cs b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs
similarity index 69%
rename from test/Spring/Spring.SessionFactoryImplError.Tests/TestUsingHibernateTxScopeTransactionManager.cs
rename to test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs
index 750762f4..ffea7bc8 100644
--- a/test/Spring/Spring.SessionFactoryImplError.Tests/TestUsingHibernateTxScopeTransactionManager.cs
+++ b/test/Spring/Spring.Data.NHibernate.TxPromotion.Integration.Tests/TestUsingHibernateTxScopeTransactionManager.cs
@@ -3,14 +3,14 @@
 using Spring.Data.NHibernate.Generic;
 using Spring.Testing.NUnit;
 
-namespace Spring.SessionFactoryImplError.Tests
+namespace Spring.Data.NHibernate.TxPromotion.Integration.Tests
 {
     [TestFixture]
     public class TestUsingHibernateTxScopeTransactionManager : AbstractTransactionalSpringContextTests
     {
         #region DI
 
-        public HibernateTemplate HibernateTemplate { get; set; }
+        public Generic.HibernateTemplate HibernateTemplate { get; set; }
         public IService1 Service1 { get; set; }
         public IService2 Service2 { get; set; }
 
@@ -23,9 +23,9 @@ namespace Spring.SessionFactoryImplError.Tests
                 return new[]
                 {
                     "config://spring/objects",
-				    "assembly://Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests/Spring.Configuration.xml",
-                    "assembly://Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests/Spring.NHibernate.xml",     
-                    "assembly://Spring.SessionFactoryImplError.Tests/Spring.SessionFactoryImplError.Tests/Spring.HibernateTxScopeTransactionManager.xml"                         
+				    "assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Configuration.xml",
+                    "assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.NHibernate.xml",     
+                    "assembly://Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.Data.NHibernate.TxPromotion.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml"                         
                 };
             }
         }