diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs
similarity index 94%
rename from src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs
rename to src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs
index 22971e80..2fb656bd 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs
@@ -34,18 +34,18 @@ namespace Spring.Objects.Factory.Support
     /// </para>
     /// </remarks>
     /// <typeparam name="T"></typeparam>
-    public class DelegatingFactoryObject<T> : IFactoryObject
+    public class DelegateInvokingFactoryObject<T> : IFactoryObject
     {
         private readonly bool _isSingleton;
         private readonly Func<T> _builderDelegate;
 
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DelegatingFactoryObject&lt;T&gt;"/> class.
+        /// Initializes a new instance of the <see cref="DelegateInvokingFactoryObject{T}"/> class.
         /// </summary>
         /// <param name="builderDelegate">The builder delegate.</param>
         /// <param name="isSingleton">if set to <c>true</c> [is singleton].</param>
-        public DelegatingFactoryObject(Func<T> builderDelegate, bool isSingleton)
+        public DelegateInvokingFactoryObject(Func<T> builderDelegate, bool isSingleton)
         {
             _builderDelegate = builderDelegate;
             _isSingleton = isSingleton;
diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj
index 2dcd89a4..3ea6eac4 100644
--- a/src/Spring/Spring.Core/Spring.Core.2008.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2008.csproj
@@ -708,7 +708,7 @@
     <Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
     <Compile Include="Objects\Factory\Parsing\Problem.cs" />
     <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
     <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
     <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
     <Compile Include="Util\ConstructorInstantiationInfo.cs" />
diff --git a/src/Spring/Spring.Core/Spring.Core.2010.csproj b/src/Spring/Spring.Core/Spring.Core.2010.csproj
index e6f1052e..18b82f56 100644
--- a/src/Spring/Spring.Core/Spring.Core.2010.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2010.csproj
@@ -710,7 +710,7 @@
     <Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
     <Compile Include="Objects\Factory\Parsing\Problem.cs" />
     <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
     <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
     <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
     <Compile Include="Stereotype\ControllerAttribute.cs" />
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs
similarity index 93%
rename from test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs
rename to test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs
index e1597777..feeda910 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs
@@ -5,7 +5,7 @@ using Spring.Context.Support;
 namespace Spring.Objects.Factory.Support
 {
     [TestFixture]
-    public class DelegatingFactoryObjectTests
+    public class DelegateInvokingFactoryObjectTests
     {
         [SetUp]
         public void _TestSetUp()
@@ -18,7 +18,7 @@ namespace Spring.Objects.Factory.Support
         private void RegisterDelegatingFactoryWithContext(bool buildSingletonObjectsWhenInvoked)
         {
             var targetBuilder = new ThingThatBuildsTargets();
-            var factory = new DelegatingFactoryObject<TargetToBuild>(targetBuilder.BuildTarget, buildSingletonObjectsWhenInvoked);
+            var factory = new DelegateInvokingFactoryObject<TargetToBuild>(targetBuilder.BuildTarget, buildSingletonObjectsWhenInvoked);
 
             Assume.That(ContextRegistry.GetContext(), Is.InstanceOf<IConfigurableApplicationContext>(), "test requires a registered context that implements IConfigurableApplicationContext!");
 
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
index 85989c54..f7f59517 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
@@ -339,7 +339,7 @@
     <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurerTests.cs" />
     <Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
     <Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
index 28684fe1..cde1aff5 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
@@ -342,6 +342,7 @@
     <Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
     <Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
     <Compile Include="Objects\Factory\ObjectFactoryUtils_PreserveOrderInHierarchy_Tests.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />
@@ -359,7 +360,6 @@
     <Compile Include="Objects\LazyTestObject.cs" />
     <Compile Include="Objects\Support\AbstractSharedStateFactoryTests.cs" />
     <Compile Include="Objects\Support\ByTypeSharedStateProviderTests.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
     <Compile Include="Objects\Support\MethodInvokerTests.cs">
       <SubType>Code</SubType>
     </Compile>