diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
index cf7d8ca42..cc6d6c553 100644
--- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
+++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
@@ -11,6 +11,7 @@ using Orchard.ContentManagement.Records;
 using Orchard.DisplayManagement;
 using Orchard.DisplayManagement.Descriptors;
 using Orchard.Environment.Extensions;
+using Orchard.Tests.ContentManagement.Handlers;
 using Orchard.Tests.ContentManagement.Records;
 using Orchard.Tests.ContentManagement.Models;
 using Orchard.DisplayManagement.Implementation;
@@ -37,30 +38,23 @@ namespace Orchard.Tests.ContentManagement {
                 typeof(ContentTypeRecord));
         }
 
-        [TestFixtureTearDown]
-        public void TermFixture() {
-
-        }
-
-
-
         [SetUp]
         public void Init() {
             var builder = new ContainerBuilder();
-            // builder.RegisterModule(new ImplicitCollectionSupportModule());
+
             builder.RegisterModule(new ContentModule());
             builder.RegisterType<DefaultContentManager>().As<IContentManager>().SingleInstance();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
 
-            builder.RegisterType<AlphaHandler>().As<IContentHandler>();
-            builder.RegisterType<BetaHandler>().As<IContentHandler>();
-            builder.RegisterType<GammaHandler>().As<IContentHandler>();
-            builder.RegisterType<DeltaHandler>().As<IContentHandler>();
-            builder.RegisterType<EpsilonHandler>().As<IContentHandler>();
-            builder.RegisterType<FlavoredHandler>().As<IContentHandler>();
-            builder.RegisterType<StyledHandler>().As<IContentHandler>();           
+            builder.RegisterType<AlphaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<BetaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<GammaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<DeltaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<EpsilonPartHandler>().As<IContentHandler>();
+            builder.RegisterType<FlavoredPartHandler>().As<IContentHandler>();
+            builder.RegisterType<StyledHandler>().As<IContentHandler>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
 
@@ -87,10 +81,10 @@ namespace Orchard.Tests.ContentManagement {
         }
 
         private void AddSampleData() {
-            _manager.Create<Alpha>("alpha", init => { });
-            _manager.Create<Beta>("beta", init => { });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "the frap value"; });
-            _manager.Create<Delta>("delta", init => { init.Record.Quux = "the quux value"; });
+            _manager.Create<AlphaPart>("alpha", init => { });
+            _manager.Create<BetaPart>("beta", init => { });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "the frap value"; });
+            _manager.Create<DeltaPart>("delta", init => { init.Record.Quux = "the quux value"; });
             _session.Flush();
         }
 
@@ -136,10 +130,10 @@ namespace Orchard.Tests.ContentManagement {
             var allItems = _manager.Query().List();
 
             Assert.That(allItems.Count(), Is.EqualTo(4));
-            Assert.That(allItems.Count(x => x.Has<Alpha>()), Is.EqualTo(1));
-            Assert.That(allItems.Count(x => x.Has<Beta>()), Is.EqualTo(1));
-            Assert.That(allItems.Count(x => x.Has<Gamma>()), Is.EqualTo(1));
-            Assert.That(allItems.Count(x => x.Has<Delta>()), Is.EqualTo(1));
+            Assert.That(allItems.Count(x => x.Has<AlphaPart>()), Is.EqualTo(1));
+            Assert.That(allItems.Count(x => x.Has<BetaPart>()), Is.EqualTo(1));
+            Assert.That(allItems.Count(x => x.Has<GammaPart>()), Is.EqualTo(1));
+            Assert.That(allItems.Count(x => x.Has<DeltaPart>()), Is.EqualTo(1));
         }
 
         [Test]
@@ -149,37 +143,37 @@ namespace Orchard.Tests.ContentManagement {
             var alphaBeta = _manager.Query().ForType("alpha", "beta").List();
 
             Assert.That(alphaBeta.Count(), Is.EqualTo(2));
-            Assert.That(alphaBeta.Count(x => x.Has<Alpha>()), Is.EqualTo(1));
-            Assert.That(alphaBeta.Count(x => x.Has<Beta>()), Is.EqualTo(1));
-            Assert.That(alphaBeta.Count(x => x.Has<Gamma>()), Is.EqualTo(0));
-            Assert.That(alphaBeta.Count(x => x.Has<Delta>()), Is.EqualTo(0));
+            Assert.That(alphaBeta.Count(x => x.Has<AlphaPart>()), Is.EqualTo(1));
+            Assert.That(alphaBeta.Count(x => x.Has<BetaPart>()), Is.EqualTo(1));
+            Assert.That(alphaBeta.Count(x => x.Has<GammaPart>()), Is.EqualTo(0));
+            Assert.That(alphaBeta.Count(x => x.Has<DeltaPart>()), Is.EqualTo(0));
 
             var gammaDelta = _manager.Query().ForType("gamma", "delta").List();
 
             Assert.That(gammaDelta.Count(), Is.EqualTo(2));
-            Assert.That(gammaDelta.Count(x => x.Has<Alpha>()), Is.EqualTo(0));
-            Assert.That(gammaDelta.Count(x => x.Has<Beta>()), Is.EqualTo(0));
-            Assert.That(gammaDelta.Count(x => x.Has<Gamma>()), Is.EqualTo(1));
-            Assert.That(gammaDelta.Count(x => x.Has<Delta>()), Is.EqualTo(1));
+            Assert.That(gammaDelta.Count(x => x.Has<AlphaPart>()), Is.EqualTo(0));
+            Assert.That(gammaDelta.Count(x => x.Has<BetaPart>()), Is.EqualTo(0));
+            Assert.That(gammaDelta.Count(x => x.Has<GammaPart>()), Is.EqualTo(1));
+            Assert.That(gammaDelta.Count(x => x.Has<DeltaPart>()), Is.EqualTo(1));
         }
 
         [Test]
         public void WherePredicateRestrictsResults() {
             AddSampleData();
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "one"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "two"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "three"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "four"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "one"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
             _session.Flush();
 
-            var twoOrFour = _manager.Query<Gamma, GammaRecord>()
+            var twoOrFour = _manager.Query<GammaPart, GammaRecord>()
                 .Where(x => x.Frap == "one" || x.Frap == "four")
                 .List();
 
             Assert.That(twoOrFour.Count(), Is.EqualTo(2));
-            Assert.That(twoOrFour.Count(x => x.Has<Gamma>()), Is.EqualTo(2));
-            Assert.That(twoOrFour.Count(x => x.Get<Gamma>().Record.Frap == "one"), Is.EqualTo(1));
-            Assert.That(twoOrFour.Count(x => x.Get<Gamma>().Record.Frap == "four"), Is.EqualTo(1));
+            Assert.That(twoOrFour.Count(x => x.Has<GammaPart>()), Is.EqualTo(2));
+            Assert.That(twoOrFour.Count(x => x.Get<GammaPart>().Record.Frap == "one"), Is.EqualTo(1));
+            Assert.That(twoOrFour.Count(x => x.Get<GammaPart>().Record.Frap == "four"), Is.EqualTo(1));
         }
 
 
@@ -191,23 +185,23 @@ namespace Orchard.Tests.ContentManagement {
 
             Assert.That(gammas.Count(), Is.EqualTo(1));
             Assert.That(deltas.Count(), Is.EqualTo(1));
-            Assert.That(gammas.AsPart<Gamma>().Single().Record.Frap, Is.EqualTo("the frap value"));
-            Assert.That(deltas.AsPart<Delta>().Single().Record.Quux, Is.EqualTo("the quux value"));
+            Assert.That(gammas.AsPart<GammaPart>().Single().Record.Frap, Is.EqualTo("the frap value"));
+            Assert.That(deltas.AsPart<DeltaPart>().Single().Record.Quux, Is.EqualTo("the quux value"));
         }
 
         [Test]
         public void OrderMaySortOnJoinedRecord() {
             AddSampleData();
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "one"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "two"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "three"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "four"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "one"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
             _session.Flush();
             _session.Clear();
 
             var ascending = _manager.Query("gamma")
                 .OrderBy<GammaRecord, string>(x => x.Frap)
-                .List<Gamma>().ToList();
+                .List<GammaPart>().ToList();
 
             Assert.That(ascending.Count(), Is.EqualTo(5));
             Assert.That(ascending.First().Record.Frap, Is.EqualTo("four"));
@@ -215,7 +209,7 @@ namespace Orchard.Tests.ContentManagement {
 
             _session.Clear();
 
-            var descending = _manager.Query<Gamma, GammaRecord>()
+            var descending = _manager.Query<GammaPart, GammaRecord>()
                 .OrderByDescending(x => x.Frap)
                 .List().ToList();
 
@@ -227,10 +221,10 @@ namespace Orchard.Tests.ContentManagement {
         [Test]
         public void SkipAndTakeProvidePagination() {
             AddSampleData();
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "one"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "two"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "three"; });
-            _manager.Create<Gamma>("gamma", init => { init.Record.Frap = "four"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "one"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
+            _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
             _session.Flush();
 
             var reverseById = _manager.Query()
@@ -261,26 +255,26 @@ namespace Orchard.Tests.ContentManagement {
         [Test]
         public void QueryShouldJoinVersionedRecords() {
             AddSampleData();
-            _manager.Create<Gamma>("gamma", init => {
+            _manager.Create<GammaPart>("gamma", init => {
                 init.Record.Frap = "one";
-                init.As<Epsilon>().Record.Quad = "1";
+                init.As<EpsilonPart>().Record.Quad = "1";
             });
-            _manager.Create<Gamma>("gamma", init => {
+            _manager.Create<GammaPart>("gamma", init => {
                 init.Record.Frap = "two";
-                init.As<Epsilon>().Record.Quad = "2";
+                init.As<EpsilonPart>().Record.Quad = "2";
             });
-            _manager.Create<Gamma>("gamma", init => {
+            _manager.Create<GammaPart>("gamma", init => {
                 init.Record.Frap = "three";
-                init.As<Epsilon>().Record.Quad = "3";
+                init.As<EpsilonPart>().Record.Quad = "3";
             });
-            _manager.Create<Gamma>("gamma", init => {
+            _manager.Create<GammaPart>("gamma", init => {
                 init.Record.Frap = "four";
-                init.As<Epsilon>().Record.Quad = "4";
+                init.As<EpsilonPart>().Record.Quad = "4";
             });
             _session.Flush();
             _session.Clear();
 
-            var results = _manager.Query<Epsilon, EpsilonRecord>()
+            var results = _manager.Query<EpsilonPart, EpsilonRecord>()
                 .Where(x => x.Quad == "2" || x.Quad == "3")
                 .OrderByDescending(x => x.Quad)
                 .List();
@@ -293,21 +287,21 @@ namespace Orchard.Tests.ContentManagement {
 
         private void AddGammaVersions() {
             var gamma1 = _manager.Create<ContentItem>("gamma", init => {
-                init.As<Gamma>().Record.Frap = "one";
-                init.As<Epsilon>().Record.Quad = "v1";
+                init.As<GammaPart>().Record.Frap = "one";
+                init.As<EpsilonPart>().Record.Quad = "v1";
             });
             _session.Flush();
             _session.Clear();
 
             var gamma2 = _manager.Get(gamma1.Id, VersionOptions.DraftRequired);
-            gamma2.As<Gamma>().Record.Frap = "two";
-            gamma2.As<Epsilon>().Record.Quad = "v2";
+            gamma2.As<GammaPart>().Record.Frap = "two";
+            gamma2.As<EpsilonPart>().Record.Quad = "v2";
             _session.Flush();
             _session.Clear();
 
             var gamma3 = _manager.Create<ContentItem>("gamma", init => {
-                init.As<Gamma>().Record.Frap = "three";
-                init.As<Epsilon>().Record.Quad = "v3";
+                init.As<GammaPart>().Record.Frap = "three";
+                init.As<EpsilonPart>().Record.Quad = "v3";
             });
             _session.Flush();
             _session.Clear();
@@ -317,27 +311,27 @@ namespace Orchard.Tests.ContentManagement {
         public void QueryShouldOnlyReturnPublishedByDefault() {
             AddGammaVersions();
 
-            var list1 = _manager.Query<Gamma>()
+            var list1 = _manager.Query<GammaPart>()
                 .Where<EpsilonRecord>(x => x.Quad == "v1")
                 .List();
 
-            var list2 = _manager.Query<Gamma>()
+            var list2 = _manager.Query<GammaPart>()
                 .Where<EpsilonRecord>(x => x.Quad == "v2")
                 .List();
 
-            var list3 = _manager.Query<Gamma>()
+            var list3 = _manager.Query<GammaPart>()
                 .Where<EpsilonRecord>(x => x.Quad == "v3")
                 .List();
 
-            var listOne = _manager.Query<Gamma>()
+            var listOne = _manager.Query<GammaPart>()
                 .Where<GammaRecord>(x => x.Frap == "one")
                 .List();
 
-            var listTwo = _manager.Query<Gamma>()
+            var listTwo = _manager.Query<GammaPart>()
                 .Where<GammaRecord>(x => x.Frap == "two")
                 .List();
 
-            var listThree = _manager.Query<Gamma>()
+            var listThree = _manager.Query<GammaPart>()
                 .Where<GammaRecord>(x => x.Frap == "three")
                 .List();
 
@@ -353,27 +347,27 @@ namespace Orchard.Tests.ContentManagement {
         public void QueryForLatestShouldNotReturnEarlierVersions() {
             AddGammaVersions();
 
-            var list1 = _manager.Query<Gamma>(VersionOptions.Latest)
+            var list1 = _manager.Query<GammaPart>(VersionOptions.Latest)
                 .Where<EpsilonRecord>(x => x.Quad == "v1")
                 .List();
 
-            var list2 = _manager.Query<Gamma>(VersionOptions.Latest)
+            var list2 = _manager.Query<GammaPart>(VersionOptions.Latest)
                 .Where<EpsilonRecord>(x => x.Quad == "v2")
                 .List();
 
-            var list3 = _manager.Query<Gamma>(VersionOptions.Latest)
+            var list3 = _manager.Query<GammaPart>(VersionOptions.Latest)
                 .Where<EpsilonRecord>(x => x.Quad == "v3")
                 .List();
 
-            var listOne = _manager.Query<Gamma>(VersionOptions.Latest)
+            var listOne = _manager.Query<GammaPart>(VersionOptions.Latest)
                 .Where<GammaRecord>(x => x.Frap == "one")
                 .List();
 
-            var listTwo = _manager.Query<Gamma>(VersionOptions.Latest)
+            var listTwo = _manager.Query<GammaPart>(VersionOptions.Latest)
                 .Where<GammaRecord>(x => x.Frap == "two")
                 .List();
 
-            var listThree = _manager.Query<Gamma>(VersionOptions.Latest)
+            var listThree = _manager.Query<GammaPart>(VersionOptions.Latest)
                 .Where<GammaRecord>(x => x.Frap == "three")
                 .List();
 
@@ -389,27 +383,27 @@ namespace Orchard.Tests.ContentManagement {
         public void QueryForDraftShouldOnlyReturnLatestThatIsNotPublished() {
             AddGammaVersions();
 
-            var list1 = _manager.Query<Gamma>(VersionOptions.Draft)
+            var list1 = _manager.Query<GammaPart>(VersionOptions.Draft)
                 .Where<EpsilonRecord>(x => x.Quad == "v1")
                 .List();
 
-            var list2 = _manager.Query<Gamma>(VersionOptions.Draft)
+            var list2 = _manager.Query<GammaPart>(VersionOptions.Draft)
                 .Where<EpsilonRecord>(x => x.Quad == "v2")
                 .List();
 
-            var list3 = _manager.Query<Gamma>(VersionOptions.Draft)
+            var list3 = _manager.Query<GammaPart>(VersionOptions.Draft)
                 .Where<EpsilonRecord>(x => x.Quad == "v3")
                 .List();
 
-            var listOne = _manager.Query<Gamma>(VersionOptions.Draft)
+            var listOne = _manager.Query<GammaPart>(VersionOptions.Draft)
                 .Where<GammaRecord>(x => x.Frap == "one")
                 .List();
 
-            var listTwo = _manager.Query<Gamma>(VersionOptions.Draft)
+            var listTwo = _manager.Query<GammaPart>(VersionOptions.Draft)
                 .Where<GammaRecord>(x => x.Frap == "two")
                 .List();
 
-            var listThree = _manager.Query<Gamma>(VersionOptions.Draft)
+            var listThree = _manager.Query<GammaPart>(VersionOptions.Draft)
                 .Where<GammaRecord>(x => x.Frap == "three")
                 .List();
 
@@ -425,27 +419,27 @@ namespace Orchard.Tests.ContentManagement {
         public void QueryForAllShouldReturnMultipleQualifiedVersions() {
             AddGammaVersions();
 
-            var list1 = _manager.Query<Gamma>(VersionOptions.AllVersions)
+            var list1 = _manager.Query<GammaPart>(VersionOptions.AllVersions)
                 .Where<EpsilonRecord>(x => x.Quad == "v1")
                 .List();
 
-            var list2 = _manager.Query<Gamma>(VersionOptions.AllVersions)
+            var list2 = _manager.Query<GammaPart>(VersionOptions.AllVersions)
                 .Where<EpsilonRecord>(x => x.Quad == "v2")
                 .List();
 
-            var list3 = _manager.Query<Gamma>(VersionOptions.AllVersions)
+            var list3 = _manager.Query<GammaPart>(VersionOptions.AllVersions)
                 .Where<EpsilonRecord>(x => x.Quad == "v3")
                 .List();
 
-            var listOne = _manager.Query<Gamma>(VersionOptions.AllVersions)
+            var listOne = _manager.Query<GammaPart>(VersionOptions.AllVersions)
                 .Where<GammaRecord>(x => x.Frap == "one")
                 .List();
 
-            var listTwo = _manager.Query<Gamma>(VersionOptions.AllVersions)
+            var listTwo = _manager.Query<GammaPart>(VersionOptions.AllVersions)
                 .Where<GammaRecord>(x => x.Frap == "two")
                 .List();
 
-            var listThree = _manager.Query<Gamma>(VersionOptions.AllVersions)
+            var listThree = _manager.Query<GammaPart>(VersionOptions.AllVersions)
                 .Where<GammaRecord>(x => x.Frap == "three")
                 .List();
 
diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
index 2a0d55261..d9613db7f 100644
--- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
+++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
@@ -13,6 +13,7 @@ using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.Records;
 using Orchard.Environment.Extensions;
+using Orchard.Tests.ContentManagement.Handlers;
 using Orchard.Tests.ContentManagement.Records;
 using Orchard.Tests.ContentManagement.Models;
 using Orchard.DisplayManagement.Descriptors;
@@ -49,11 +50,6 @@ namespace Orchard.Tests.ContentManagement {
                 typeof(MegaRecord));
         }
 
-        [TestFixtureTearDown]
-        public void TermFixture() {
-
-        }
-
         [SetUp]
         public void Init() {
             _contentDefinitionManager = new Mock<IContentDefinitionManager>();
@@ -64,12 +60,12 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterInstance(_contentDefinitionManager.Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
 
-            builder.RegisterType<AlphaHandler>().As<IContentHandler>();
-            builder.RegisterType<BetaHandler>().As<IContentHandler>();
-            builder.RegisterType<GammaHandler>().As<IContentHandler>();
-            builder.RegisterType<DeltaHandler>().As<IContentHandler>();
-            builder.RegisterType<EpsilonHandler>().As<IContentHandler>();
-            builder.RegisterType<FlavoredHandler>().As<IContentHandler>();
+            builder.RegisterType<AlphaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<BetaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<GammaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<DeltaPartHandler>().As<IContentHandler>();
+            builder.RegisterType<EpsilonPartHandler>().As<IContentHandler>();
+            builder.RegisterType<FlavoredPartHandler>().As<IContentHandler>();
             builder.RegisterType<StyledHandler>().As<IContentHandler>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
@@ -102,33 +98,33 @@ namespace Orchard.Tests.ContentManagement {
         public void AlphaDriverShouldWeldItsPart() {
             var foo = _manager.New(DefaultAlphaName);
 
-            Assert.That(foo.Is<Alpha>(), Is.True);
-            Assert.That(foo.As<Alpha>(), Is.Not.Null);
-            Assert.That(foo.Is<Beta>(), Is.False);
-            Assert.That(foo.As<Beta>(), Is.Null);
+            Assert.That(foo.Is<AlphaPart>(), Is.True);
+            Assert.That(foo.As<AlphaPart>(), Is.Not.Null);
+            Assert.That(foo.Is<BetaPart>(), Is.False);
+            Assert.That(foo.As<BetaPart>(), Is.Null);
         }
 
         [Test]
         public void StronglyTypedNewShouldTypeCast() {
-            var foo = _manager.New<Alpha>(DefaultAlphaName);
+            var foo = _manager.New<AlphaPart>(DefaultAlphaName);
             Assert.That(foo, Is.Not.Null);
-            Assert.That(foo.GetType(), Is.EqualTo(typeof(Alpha)));
+            Assert.That(foo.GetType(), Is.EqualTo(typeof(AlphaPart)));
         }
 
         [Test, ExpectedException(typeof(InvalidCastException))]
         public void StronglyTypedNewShouldThrowCastExceptionIfNull() {
-            _manager.New<Beta>(DefaultAlphaName);
+            _manager.New<BetaPart>(DefaultAlphaName);
         }
 
         [Test]
         public void AlphaIsFlavoredAndStyledAndBetaIsFlavoredOnly() {
-            var alpha = _manager.New<Alpha>(DefaultAlphaName);
-            var beta = _manager.New<Beta>(DefaultBetaName);
+            var alpha = _manager.New<AlphaPart>(DefaultAlphaName);
+            var beta = _manager.New<BetaPart>(DefaultBetaName);
 
-            Assert.That(alpha.Is<Flavored>(), Is.True);
-            Assert.That(alpha.Is<Styled>(), Is.True);
-            Assert.That(beta.Is<Flavored>(), Is.True);
-            Assert.That(beta.Is<Styled>(), Is.False);
+            Assert.That(alpha.Is<FlavoredPart>(), Is.True);
+            Assert.That(alpha.Is<StyledPart>(), Is.True);
+            Assert.That(beta.Is<FlavoredPart>(), Is.True);
+            Assert.That(beta.Is<StyledPart>(), Is.False);
         }
 
         [Test]
@@ -165,9 +161,9 @@ namespace Orchard.Tests.ContentManagement {
 
             Assert.That(model.ContentType, Is.EqualTo(DefaultGammaName));
             Assert.That(model.Id, Is.EqualTo(modelRecord.Id));
-            Assert.That(model.Is<Gamma>(), Is.True);
-            Assert.That(model.As<Gamma>().Record, Is.Not.Null);
-            Assert.That(model.As<Gamma>().Record.ContentItemRecord.Id, Is.EqualTo(model.Id));
+            Assert.That(model.Is<GammaPart>(), Is.True);
+            Assert.That(model.As<GammaPart>().Record, Is.Not.Null);
+            Assert.That(model.As<GammaPart>().Record.ContentItemRecord.Id, Is.EqualTo(model.Id));
 
         }
 
@@ -253,7 +249,7 @@ namespace Orchard.Tests.ContentManagement {
 
         [Test]
         public void InitialVersionShouldBeOne() {
-            var gamma1 = _manager.Create<Gamma>(DefaultGammaName);
+            var gamma1 = _manager.Create<GammaPart>(DefaultGammaName);
             Assert.That(gamma1.ContentItem.Record, Is.Not.Null);
             Assert.That(gamma1.ContentItem.VersionRecord, Is.Not.Null);
             Assert.That(gamma1.ContentItem.Version, Is.EqualTo(1));
@@ -263,7 +259,7 @@ namespace Orchard.Tests.ContentManagement {
             _session.Clear();
             Trace.WriteLine("session flushed");
 
-            var gamma2 = _manager.Get<Gamma>(gamma1.ContentItem.Id);
+            var gamma2 = _manager.Get<GammaPart>(gamma1.ContentItem.Id);
             Assert.That(gamma2.ContentItem.Record, Is.Not.Null);
             Assert.That(gamma2.ContentItem.VersionRecord, Is.Not.Null);
             Assert.That(gamma2.ContentItem.Version, Is.EqualTo(1));
@@ -279,7 +275,7 @@ namespace Orchard.Tests.ContentManagement {
 
         [Test]
         public void InitialVersionCanBeSpecifiedAndIsPublished() {
-            var gamma1 = _manager.Create<Gamma>(DefaultGammaName, VersionOptions.Number(4));
+            var gamma1 = _manager.Create<GammaPart>(DefaultGammaName, VersionOptions.Number(4));
 
             Assert.That(gamma1.ContentItem.Version, Is.EqualTo(4));
             Assert.That(gamma1.ContentItem.VersionRecord.Published, Is.True);
@@ -406,9 +402,9 @@ namespace Orchard.Tests.ContentManagement {
         [Test]
         public void NonVersionedPartsAreBoundToSameRecord() {
             Trace.WriteLine("gamma1");
-            var gamma1 = _manager.Create<Gamma>(DefaultGammaName, VersionOptions.Published, init => init.Record.Frap = "version one");
+            var gamma1 = _manager.Create<GammaPart>(DefaultGammaName, VersionOptions.Published, init => init.Record.Frap = "version one");
             Trace.WriteLine("gamma2");
-            var gamma2 = _manager.Get<Gamma>(gamma1.ContentItem.Id, VersionOptions.DraftRequired);
+            var gamma2 = _manager.Get<GammaPart>(gamma1.ContentItem.Id, VersionOptions.DraftRequired);
             Assert.That(gamma1.Record.Frap, Is.EqualTo("version one"));
             Assert.That(gamma2.Record.Frap, Is.EqualTo("version one"));
             gamma2.Record.Frap = "version two";
@@ -420,9 +416,9 @@ namespace Orchard.Tests.ContentManagement {
             _session.Clear();
 
             Trace.WriteLine("gamma1B");
-            var gamma1B = _manager.Get<Gamma>(gamma1.ContentItem.Id, VersionOptions.Published);
+            var gamma1B = _manager.Get<GammaPart>(gamma1.ContentItem.Id, VersionOptions.Published);
             Trace.WriteLine("gamma2B");
-            var gamma2B = _manager.Get<Gamma>(gamma1.ContentItem.Id, VersionOptions.Draft);
+            var gamma2B = _manager.Get<GammaPart>(gamma1.ContentItem.Id, VersionOptions.Draft);
             Assert.That(gamma1B.Record, Is.SameAs(gamma2B.Record));
             Assert.That(gamma1B.Record.Frap, Is.EqualTo("version two"));
             Assert.That(gamma2B.Record.Frap, Is.EqualTo("version two"));
@@ -441,12 +437,12 @@ namespace Orchard.Tests.ContentManagement {
 
         [Test]
         public void VersionedPartsShouldBeDifferentRecordsWithClonedData() {
-            var gamma1 = _manager.Create<Gamma>(DefaultGammaName, VersionOptions.Published, init => init.Record.Frap = "version one");
-            var epsilon1 = gamma1.As<Epsilon>();
+            var gamma1 = _manager.Create<GammaPart>(DefaultGammaName, VersionOptions.Published, init => init.Record.Frap = "version one");
+            var epsilon1 = gamma1.As<EpsilonPart>();
             epsilon1.Record.Quad = "epsilon one";
 
-            var gamma2 = _manager.Get<Gamma>(gamma1.ContentItem.Id, VersionOptions.DraftRequired);
-            var epsilon2 = gamma2.As<Epsilon>();
+            var gamma2 = _manager.Get<GammaPart>(gamma1.ContentItem.Id, VersionOptions.DraftRequired);
+            var epsilon2 = gamma2.As<EpsilonPart>();
 
             Assert.That(epsilon1.Record.Quad, Is.EqualTo("epsilon one"));
             Assert.That(epsilon2.Record.Quad, Is.EqualTo("epsilon one"));
@@ -458,10 +454,10 @@ namespace Orchard.Tests.ContentManagement {
             _session.Flush();
             _session.Clear();
 
-            var gamma1B = _manager.Get<Gamma>(gamma1.ContentItem.Id, VersionOptions.Published);
-            var epsilon1B = gamma1B.As<Epsilon>();
-            var gamma2B = _manager.Get<Gamma>(gamma1.ContentItem.Id, VersionOptions.Draft);
-            var epsilon2B = gamma2B.As<Epsilon>();
+            var gamma1B = _manager.Get<GammaPart>(gamma1.ContentItem.Id, VersionOptions.Published);
+            var epsilon1B = gamma1B.As<EpsilonPart>();
+            var gamma2B = _manager.Get<GammaPart>(gamma1.ContentItem.Id, VersionOptions.Draft);
+            var epsilon2B = gamma2B.As<EpsilonPart>();
             Assert.That(gamma1B.Record, Is.SameAs(gamma2B.Record));
             Assert.That(epsilon1B.Record, Is.Not.SameAs(epsilon2B.Record));
             Assert.That(epsilon1B.Record.Quad, Is.EqualTo("epsilon one"));
@@ -554,7 +550,7 @@ namespace Orchard.Tests.ContentManagement {
             Assert.That(contentItem.TypeDefinition, Is.Not.Null);
             Assert.That(contentItem.TypeDefinition, Is.SameAs(alphaType));
 
-            var flavored = contentItem.As<Flavored>();
+            var flavored = contentItem.As<FlavoredPart>();
             Assert.That(flavored, Is.Not.Null);
             Assert.That(flavored.TypePartDefinition, Is.Not.Null);
             Assert.That(flavored.TypePartDefinition.Settings["spin"], Is.EqualTo("clockwise"));
@@ -563,7 +559,7 @@ namespace Orchard.Tests.ContentManagement {
         [Test]
         public void FieldsCanBeWeldIntoParts() {
             var contentItem = _manager.New(DefaultAlphaName);
-            var part = contentItem.As<Flavored>();
+            var part = contentItem.As<FlavoredPart>();
             var field = new Phi();
             part.Weld(field);
             Assert.That(part.Has(typeof(Phi), "Phi"));
@@ -572,7 +568,7 @@ namespace Orchard.Tests.ContentManagement {
         [Test]
         public void PartGetReturnsFieldWithName() {
             var contentItem = _manager.New(DefaultAlphaName);
-            var part = contentItem.As<Flavored>();
+            var part = contentItem.As<FlavoredPart>();
             var field = new Phi();
             part.Weld(field);
             var phi = part.Get(typeof(Phi), "Phi");
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs
new file mode 100644
index 000000000..3616a43e4
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Handlers/AlphaPartHandler.cs
@@ -0,0 +1,16 @@
+using Orchard.ContentManagement.Handlers;
+using Orchard.Tests.ContentManagement.Models;
+
+namespace Orchard.Tests.ContentManagement.Handlers {
+    public class AlphaPartHandler : ContentHandler {
+        public AlphaPartHandler() {
+            OnGetDisplayShape<AlphaPart>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "3"));
+        }
+        
+        protected override void Activating(ActivatingContentContext context) {
+            if (context.ContentType == "alpha") {
+                context.Builder.Weld<AlphaPart>();
+            }
+        }
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs
new file mode 100644
index 000000000..44df432fe
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Handlers/BetaPartHandler.cs
@@ -0,0 +1,12 @@
+using Orchard.ContentManagement.Handlers;
+using Orchard.Tests.ContentManagement.Models;
+
+namespace Orchard.Tests.ContentManagement.Handlers {
+    public class BetaPartHandler : ContentHandler {
+        protected override void Activating(ActivatingContentContext context) {
+            if (context.ContentType == "beta") {
+                context.Builder.Weld<BetaPart>();
+            }
+        }
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs
new file mode 100644
index 000000000..afdf45f30
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Handlers/DeltaPartHandler.cs
@@ -0,0 +1,13 @@
+using Orchard.ContentManagement.Handlers;
+using Orchard.Data;
+using Orchard.Tests.ContentManagement.Models;
+using Orchard.Tests.ContentManagement.Records;
+
+namespace Orchard.Tests.ContentManagement.Handlers {
+    public class DeltaPartHandler : ContentHandler {
+        public DeltaPartHandler(IRepository<DeltaRecord> repository) {
+            Filters.Add(new ActivatingFilter<DeltaPart>(x => x == "delta"));
+            Filters.Add(StorageFilter.For(repository));
+        }
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs
new file mode 100644
index 000000000..0b0725113
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Handlers/EpsilonPartHandler.cs
@@ -0,0 +1,12 @@
+using Orchard.ContentManagement.Handlers;
+using Orchard.Data;
+using Orchard.Tests.ContentManagement.Models;
+
+namespace Orchard.Tests.ContentManagement.Handlers {
+    public class EpsilonPartHandler : ContentHandler {
+        public EpsilonPartHandler(IRepository<EpsilonRecord> repository) {
+            Filters.Add(new ActivatingFilter<EpsilonPart>(x => x == "gamma"));
+            Filters.Add(StorageFilter.For(repository));
+        }
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs
new file mode 100644
index 000000000..a37041828
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Handlers/FlavoredPartHandler.cs
@@ -0,0 +1,15 @@
+using Orchard.ContentManagement.Handlers;
+using Orchard.Tests.ContentManagement.Models;
+
+namespace Orchard.Tests.ContentManagement.Handlers {
+    public class FlavoredPartHandler : ContentHandler {
+        public FlavoredPartHandler() {
+            OnGetDisplayShape<FlavoredPart>((ctx, part) => ctx.Shape.Zones["Main"].Add(part));
+        }
+        protected override void Activating(ActivatingContentContext context) {
+            if (context.ContentType == "beta" || context.ContentType == "alpha") {
+                context.Builder.Weld<FlavoredPart>();
+            }
+        }
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs b/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs
new file mode 100644
index 000000000..cd2086713
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Handlers/GammaPartHandler.cs
@@ -0,0 +1,13 @@
+using Orchard.ContentManagement.Handlers;
+using Orchard.Data;
+using Orchard.Tests.ContentManagement.Models;
+using Orchard.Tests.ContentManagement.Records;
+
+namespace Orchard.Tests.ContentManagement.Handlers {
+    class GammaPartHandler : ContentHandler {
+        public GammaPartHandler(IRepository<GammaRecord> repository) {
+            Filters.Add(new ActivatingFilter<GammaPart>(x => x == "gamma"));
+            Filters.Add(StorageFilter.For(repository));
+        }
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs b/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs
index 5611d4881..28c3c21a2 100644
--- a/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs
+++ b/src/Orchard.Tests/ContentManagement/Handlers/ModelBuilderTests.cs
@@ -24,13 +24,13 @@ namespace Orchard.Tests.ContentManagement.Handlers {
         [Test]
         public void WeldShouldAddPartToModel() {
             var builder = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("foo").Build());
-            builder.Weld<Alpha>();
+            builder.Weld<AlphaPart>();
             var model = builder.Build();
 
-            Assert.That(model.Is<Alpha>(), Is.True);
-            Assert.That(model.As<Alpha>(), Is.Not.Null);
-            Assert.That(model.Is<Beta>(), Is.False);
-            Assert.That(model.As<Beta>(), Is.Null);
+            Assert.That(model.Is<AlphaPart>(), Is.True);
+            Assert.That(model.As<AlphaPart>(), Is.Not.Null);
+            Assert.That(model.Is<BetaPart>(), Is.False);
+            Assert.That(model.As<BetaPart>(), Is.Null);
         }
     }
 }
diff --git a/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs b/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs
deleted file mode 100644
index 370f3f999..000000000
--- a/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Orchard.ContentManagement.Handlers;
-
-namespace Orchard.Tests.ContentManagement.Models {
-    public class AlphaHandler : ContentHandler {
-        public AlphaHandler() {
-            OnGetDisplayShape<Alpha>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "3"));
-        }
-        
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "alpha") {
-                context.Builder.Weld<Alpha>();
-            }
-        }
-    }
-}
diff --git a/src/Orchard.Tests/ContentManagement/Models/Alpha.cs b/src/Orchard.Tests/ContentManagement/Models/AlphaPart.cs
similarity index 63%
rename from src/Orchard.Tests/ContentManagement/Models/Alpha.cs
rename to src/Orchard.Tests/ContentManagement/Models/AlphaPart.cs
index f0e5f8db9..8bd369406 100644
--- a/src/Orchard.Tests/ContentManagement/Models/Alpha.cs
+++ b/src/Orchard.Tests/ContentManagement/Models/AlphaPart.cs
@@ -1,6 +1,6 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.Tests.ContentManagement.Models {
-    public class Alpha : ContentPart {        
+    public class AlphaPart : ContentPart {
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs b/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs
deleted file mode 100644
index 5e03597be..000000000
--- a/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Orchard.ContentManagement.Handlers;
-
-namespace Orchard.Tests.ContentManagement.Models {
-    public class BetaHandler : ContentHandler {
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "beta") {
-                context.Builder.Weld<Beta>();
-            }
-        }
-    }
-}
diff --git a/src/Orchard.Tests/ContentManagement/Models/Beta.cs b/src/Orchard.Tests/ContentManagement/Models/BetaPart.cs
similarity index 66%
rename from src/Orchard.Tests/ContentManagement/Models/Beta.cs
rename to src/Orchard.Tests/ContentManagement/Models/BetaPart.cs
index 707e75c03..84a1b7486 100644
--- a/src/Orchard.Tests/ContentManagement/Models/Beta.cs
+++ b/src/Orchard.Tests/ContentManagement/Models/BetaPart.cs
@@ -1,6 +1,6 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.Tests.ContentManagement.Models {
-    public class Beta : ContentPart {
+    public class BetaPart : ContentPart {
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Tests/ContentManagement/Models/Delta.cs b/src/Orchard.Tests/ContentManagement/Models/Delta.cs
deleted file mode 100644
index 22e0b0c1d..000000000
--- a/src/Orchard.Tests/ContentManagement/Models/Delta.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Orchard.Data;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Tests.ContentManagement.Records;
-
-namespace Orchard.Tests.ContentManagement.Models {
-    public class Delta : ContentPart<DeltaRecord> {
-    }
-
-
-    public class DeltaHandler : ContentHandler {
-
-        public DeltaHandler(IRepository<DeltaRecord> repository) {
-            Filters.Add(new ActivatingFilter<Delta>(x => x == "delta"));
-            Filters.Add(StorageFilter.For(repository));
-        }
-    }
-}
diff --git a/src/Orchard.Tests/ContentManagement/Models/DeltaPart.cs b/src/Orchard.Tests/ContentManagement/Models/DeltaPart.cs
new file mode 100644
index 000000000..5ed50c7a5
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Models/DeltaPart.cs
@@ -0,0 +1,7 @@
+using Orchard.ContentManagement;
+using Orchard.Tests.ContentManagement.Records;
+
+namespace Orchard.Tests.ContentManagement.Models {
+    public class DeltaPart : ContentPart<DeltaRecord> {
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Models/Epsilon.cs b/src/Orchard.Tests/ContentManagement/Models/Epsilon.cs
deleted file mode 100644
index 457b7841c..000000000
--- a/src/Orchard.Tests/ContentManagement/Models/Epsilon.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Data;
-
-namespace Orchard.Tests.ContentManagement.Models {
-
-
-    public class Epsilon : ContentPart<EpsilonRecord> {
-    }
-
-    public class EpsilonHandler : ContentHandler {
-
-        public EpsilonHandler(IRepository<EpsilonRecord> repository) {
-            Filters.Add(new ActivatingFilter<Epsilon>(x => x == "gamma"));
-            Filters.Add(StorageFilter.For(repository));            
-        }
-    }
-}
diff --git a/src/Orchard.Tests/ContentManagement/Models/EpsilonPart.cs b/src/Orchard.Tests/ContentManagement/Models/EpsilonPart.cs
new file mode 100644
index 000000000..aaacc94a7
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Models/EpsilonPart.cs
@@ -0,0 +1,6 @@
+using Orchard.ContentManagement;
+
+namespace Orchard.Tests.ContentManagement.Models {
+    public class EpsilonPart : ContentPart<EpsilonRecord> {
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Models/FlavoredHandler.cs b/src/Orchard.Tests/ContentManagement/Models/FlavoredHandler.cs
deleted file mode 100644
index dde598116..000000000
--- a/src/Orchard.Tests/ContentManagement/Models/FlavoredHandler.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Orchard.ContentManagement.Handlers;
-
-namespace Orchard.Tests.ContentManagement.Models {
-    public class FlavoredHandler : ContentHandler {
-        public FlavoredHandler() {
-            OnGetDisplayShape<Flavored>((ctx, part) => ctx.Shape.Zones["Main"].Add(part));
-        }
-        protected override void Activating(ActivatingContentContext context) {
-            if (context.ContentType == "beta" || context.ContentType == "alpha") {
-                context.Builder.Weld<Flavored>();
-            }
-        }
-    }
-}
diff --git a/src/Orchard.Tests/ContentManagement/Models/Styled.cs b/src/Orchard.Tests/ContentManagement/Models/FlavoredPart.cs
similarity index 64%
rename from src/Orchard.Tests/ContentManagement/Models/Styled.cs
rename to src/Orchard.Tests/ContentManagement/Models/FlavoredPart.cs
index 3743f0052..a4525bfc1 100644
--- a/src/Orchard.Tests/ContentManagement/Models/Styled.cs
+++ b/src/Orchard.Tests/ContentManagement/Models/FlavoredPart.cs
@@ -1,6 +1,6 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.Tests.ContentManagement.Models {
-    public class Styled : ContentPart {
+    public class FlavoredPart : ContentPart {
     }
 }
diff --git a/src/Orchard.Tests/ContentManagement/Models/Gamma.cs b/src/Orchard.Tests/ContentManagement/Models/Gamma.cs
deleted file mode 100644
index ec14f4c1e..000000000
--- a/src/Orchard.Tests/ContentManagement/Models/Gamma.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Orchard.Data;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Tests.ContentManagement.Records;
-
-namespace Orchard.Tests.ContentManagement.Models {
-    public class Gamma : ContentPart<GammaRecord> {
-    }
-
-
-    public class GammaHandler : ContentHandler {
-        public GammaHandler(IRepository<GammaRecord> repository) {
-            Filters.Add(new ActivatingFilter<Gamma>(x => x == "gamma"));
-            Filters.Add(StorageFilter.For(repository));
-        }
-    }
-
-
-}
diff --git a/src/Orchard.Tests/ContentManagement/Models/GammaPart.cs b/src/Orchard.Tests/ContentManagement/Models/GammaPart.cs
new file mode 100644
index 000000000..36d86520d
--- /dev/null
+++ b/src/Orchard.Tests/ContentManagement/Models/GammaPart.cs
@@ -0,0 +1,7 @@
+using Orchard.ContentManagement;
+using Orchard.Tests.ContentManagement.Records;
+
+namespace Orchard.Tests.ContentManagement.Models {
+    public class GammaPart : ContentPart<GammaRecord> {
+    }
+}
diff --git a/src/Orchard.Tests/ContentManagement/Models/StyledHandler.cs b/src/Orchard.Tests/ContentManagement/Models/StyledHandler.cs
index 1dc29878d..f683eb6bb 100644
--- a/src/Orchard.Tests/ContentManagement/Models/StyledHandler.cs
+++ b/src/Orchard.Tests/ContentManagement/Models/StyledHandler.cs
@@ -3,12 +3,12 @@
 namespace Orchard.Tests.ContentManagement.Models {
     public class StyledHandler : ContentHandler {
         public StyledHandler() {
-            OnGetDisplayShape<Styled>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "10"));
+            OnGetDisplayShape<StyledPart>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "10"));
         }
 
         protected override void Activating(ActivatingContentContext context) {
             if (context.ContentType == "alpha") {
-                context.Builder.Weld<Styled>();
+                context.Builder.Weld<StyledPart>();
             }
         }
     }
diff --git a/src/Orchard.Tests/ContentManagement/Models/Flavored.cs b/src/Orchard.Tests/ContentManagement/Models/StyledPart.cs
similarity index 65%
rename from src/Orchard.Tests/ContentManagement/Models/Flavored.cs
rename to src/Orchard.Tests/ContentManagement/Models/StyledPart.cs
index 4439a776f..654080d2f 100644
--- a/src/Orchard.Tests/ContentManagement/Models/Flavored.cs
+++ b/src/Orchard.Tests/ContentManagement/Models/StyledPart.cs
@@ -1,6 +1,6 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.Tests.ContentManagement.Models {
-    class Flavored : ContentPart {
+    public class StyledPart : ContentPart {
     }
 }
diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
index fcc726b80..c9bccce78 100644
--- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
@@ -174,21 +174,24 @@
     <Compile Include="ContentManagement\Drivers\FieldStorage\FieldStorageProviderSelectorTests.cs" />
     <Compile Include="ContentManagement\Drivers\FieldStorage\InfosetFieldStorageProviderTests.cs" />
     <Compile Include="ContentManagement\Handlers\ContentHandlerTests.cs" />
+    <Compile Include="ContentManagement\Handlers\DeltaPartHandler.cs" />
+    <Compile Include="ContentManagement\Handlers\EpsilonPartHandler.cs" />
+    <Compile Include="ContentManagement\Handlers\GammaPartHandler.cs" />
     <Compile Include="ContentManagement\Handlers\ModelBuilderTests.cs" />
     <Compile Include="ContentManagement\MetaData\Builders\ContentTypeDefinitionBuilderTests.cs" />
     <Compile Include="ContentManagement\MetaData\Services\ContentDefinitionReaderTests.cs" />
     <Compile Include="ContentManagement\MetaData\Services\ContentDefinitionWriterTests.cs" />
-    <Compile Include="ContentManagement\Models\Alpha.cs" />
-    <Compile Include="ContentManagement\Models\AlphaHandler.cs" />
-    <Compile Include="ContentManagement\Models\Beta.cs" />
-    <Compile Include="ContentManagement\Models\BetaHandler.cs" />
-    <Compile Include="ContentManagement\Models\Delta.cs" />
-    <Compile Include="ContentManagement\Models\Epsilon.cs" />
-    <Compile Include="ContentManagement\Models\Flavored.cs" />
-    <Compile Include="ContentManagement\Models\FlavoredHandler.cs" />
-    <Compile Include="ContentManagement\Models\Gamma.cs" />
+    <Compile Include="ContentManagement\Models\AlphaPart.cs" />
+    <Compile Include="ContentManagement\Handlers\AlphaPartHandler.cs" />
+    <Compile Include="ContentManagement\Models\BetaPart.cs" />
+    <Compile Include="ContentManagement\Handlers\BetaPartHandler.cs" />
+    <Compile Include="ContentManagement\Models\DeltaPart.cs" />
+    <Compile Include="ContentManagement\Models\EpsilonPart.cs" />
+    <Compile Include="ContentManagement\Models\FlavoredPart.cs" />
+    <Compile Include="ContentManagement\Handlers\FlavoredPartHandler.cs" />
+    <Compile Include="ContentManagement\Models\GammaPart.cs" />
     <Compile Include="ContentManagement\Models\Phi.cs" />
-    <Compile Include="ContentManagement\Models\Styled.cs" />
+    <Compile Include="ContentManagement\Models\StyledPart.cs" />
     <Compile Include="ContentManagement\Models\StyledHandler.cs" />
     <Compile Include="ContentManagement\Handlers\Coordinators\ContentPartDriverCoordinatorTests.cs">
       <SubType>Code</SubType>