Index: branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs
===================================================================
--- branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs	(revision 13368)
+++ branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs	(revision 14711)
@@ -35,5 +35,5 @@
   /// </summary>
   [Item("Algorithm", "A base class for algorithms.")]
-  [StorableClass("71AEBFFD-0173-4289-82EE-482A6331226E")]
+  [StorableType("71AEBFFD-0173-4289-82EE-482A6331226E")]
   public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
     public static new Image StaticItemImage {
@@ -218,9 +218,9 @@
       base.CollectParameterValues(values);
       values.Add("Algorithm Name", new StringValue(Name));
-      values.Add("Algorithm Type", new StringValue(this.GetType().GetPrettyName()));
+      values.Add("Algorithm MemberSelection", new StringValue(this.GetType().GetPrettyName()));
       if (Problem != null) {
         Problem.CollectParameterValues(values);
         values.Add("Problem Name", new StringValue(Problem.Name));
-        values.Add("Problem Type", new StringValue(Problem.GetType().GetPrettyName()));
+        values.Add("Problem MemberSelection", new StringValue(Problem.GetType().GetPrettyName()));
       }
     }
Index: branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs
===================================================================
--- branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs	(revision 13368)
+++ branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs	(revision 14711)
@@ -27,5 +27,5 @@
 
 namespace HeuristicLab.Optimization {
-  [StorableClass("A597E90A-6274-4C66-AF24-76BB71C3F811")]
+  [StorableType("A597E90A-6274-4C66-AF24-76BB71C3F811")]
   public abstract class BasicAlgorithm : Algorithm, IStorableContent {
     public string Filename { get; set; }
Index: branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs
===================================================================
--- branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs	(revision 13368)
+++ branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs	(revision 14711)
@@ -32,5 +32,5 @@
   /// </summary>
   [Item("EngineAlgorithm", "A base class for algorithms which use an engine for execution.")]
-  [StorableClass("21523BD2-1EDD-4192-92B6-22FA1DC0592E")]
+  [StorableType("21523BD2-1EDD-4192-92B6-22FA1DC0592E")]
   public abstract class EngineAlgorithm : Algorithm {
     [Storable]
Index: branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs
===================================================================
--- branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs	(revision 13368)
+++ branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs	(revision 14711)
@@ -30,5 +30,5 @@
   /// </summary>
   [Item("Heuristic Optimization Algorithm", "A base class for heuristic optimization algorithms.")]
-  [StorableClass("6CB60BC5-35C5-4AD8-A82D-5A800100315F")]
+  [StorableType("6CB60BC5-35C5-4AD8-A82D-5A800100315F")]
   public abstract class HeuristicOptimizationAlgorithm : Algorithm {
     public new IHeuristicOptimizationProblem Problem {
Index: branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs
===================================================================
--- branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs	(revision 13368)
+++ branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs	(revision 14711)
@@ -30,5 +30,5 @@
   /// </summary>
   [Item("Heuristic Optimization Enigne Algorithm", "A base class for heuristic optimization algorithms using an execution engine.")]
-  [StorableClass("13648771-C7D3-4206-8306-CF50531A4221")]
+  [StorableType("13648771-C7D3-4206-8306-CF50531A4221")]
   public abstract class HeuristicOptimizationEngineAlgorithm : EngineAlgorithm {
     public new IHeuristicOptimizationProblem Problem {
Index: branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs
===================================================================
--- branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs	(revision 13368)
+++ branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs	(revision 14711)
@@ -31,5 +31,5 @@
   [Item("User-Defined Algorithm", "An algorithm which can be defined by the user.")]
   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 100)]
-  [StorableClass("B9B72269-4180-4DEF-9F14-751FE7525283")]
+  [StorableType("B9B72269-4180-4DEF-9F14-751FE7525283")]
   public sealed class UserDefinedAlgorithm : EngineAlgorithm, IParameterizedItem, IStorableContent {
     public string Filename { get; set; }
