diff --git a/src/main/java/eva2/gui/OptimizationEditorPanel.java b/src/main/java/eva2/gui/OptimizationEditorPanel.java
index d90ef34c..34b6eb6c 100644
--- a/src/main/java/eva2/gui/OptimizationEditorPanel.java
+++ b/src/main/java/eva2/gui/OptimizationEditorPanel.java
@@ -317,7 +317,7 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener {
     public void updateChooser() {
         String objectName = genericObjectEditor.getValue().getClass().getName();
         for (int i = 0; i < typeSelector.getItemCount(); i++) {
-            Item element = typeSelector.getItemAt(i);
+            TypeSelectorItem element = typeSelector.getItemAt(i);
 
             if (objectName.equals(element.getId())) {
                 typeSelector.getModel().setSelectedItem(element);
@@ -345,7 +345,7 @@ public class OptimizationEditorPanel extends JPanel implements ItemListener {
         String className;
 
         if ((e.getSource() == typeSelector) && (e.getStateChange() == ItemEvent.SELECTED)) {
-            className = ((Item) typeSelector.getSelectedItem()).getId();
+            className = ((TypeSelectorItem) typeSelector.getSelectedItem()).getId();
             try {
                 Object n = Class.forName(className).newInstance();
                 genericObjectEditor.setValue(n);
diff --git a/src/main/java/eva2/gui/TypeSelector.java b/src/main/java/eva2/gui/TypeSelector.java
index d2f4a15b..74926af0 100644
--- a/src/main/java/eva2/gui/TypeSelector.java
+++ b/src/main/java/eva2/gui/TypeSelector.java
@@ -15,12 +15,12 @@ import java.util.logging.Logger;
 /**
  * Created by fabian on 16/12/15.
  */
-public class TypeSelector extends JComboBox<Item> {
+public class TypeSelector extends JComboBox<TypeSelectorItem> {
     private static final Logger LOGGER = Logger.getLogger(TypeSelector.class.getName());
     /**
      * The model containing the list of names to select from
      */
-    private DefaultComboBoxModel<Item> comboBoxModel;
+    private DefaultComboBoxModel<TypeSelectorItem> comboBoxModel;
 
     public TypeSelector() {
 
@@ -33,13 +33,13 @@ public class TypeSelector extends JComboBox<Item> {
         classesLongNames = GenericObjectEditor.getClassesFromProperties(classTypeName, instances);
         LOGGER.finest("Selected type for OptimizationEditorPanel: " + classTypeName);
         if (classesLongNames.size() > 1) {
-            Vector<Item> classesList = new Vector<>();
+            Vector<TypeSelectorItem> classesList = new Vector<>();
             String[] toolTips = collectComboToolTips(instances, 100);
             int i = 0;
             for (String className : classesLongNames) {
                 String displayName = StringTools.cutClassName(className);
 
-                classesList.add(new Item(className, displayName, toolTips[i++]));
+                classesList.add(new TypeSelectorItem(className, displayName, toolTips[i++]));
             }
             comboBoxModel = new DefaultComboBoxModel<>(classesList);
             this.setModel(comboBoxModel);
@@ -89,7 +89,7 @@ class ToolTipComboBoxRenderer extends BasicComboBoxRenderer {
                 isSelected, cellHasFocus);
 
         if (value != null) {
-            Item item = (Item)value;
+            TypeSelectorItem item = (TypeSelectorItem)value;
             setText(item.getDisplayName());
 
             if (isSelected) {
@@ -103,7 +103,7 @@ class ToolTipComboBoxRenderer extends BasicComboBoxRenderer {
         }
 
         if (index == -1) {
-            Item item = (Item)value;
+            TypeSelectorItem item = (TypeSelectorItem)value;
             setText(item.getDisplayName());
         }
 
diff --git a/src/main/java/eva2/gui/Item.java b/src/main/java/eva2/gui/TypeSelectorItem.java
similarity index 81%
rename from src/main/java/eva2/gui/Item.java
rename to src/main/java/eva2/gui/TypeSelectorItem.java
index c077d4f8..310b0a48 100644
--- a/src/main/java/eva2/gui/Item.java
+++ b/src/main/java/eva2/gui/TypeSelectorItem.java
@@ -1,12 +1,12 @@
 package eva2.gui;
 
-public class Item
+public class TypeSelectorItem
 {
     private String id;
     private String displayName;
     private String description;
 
-    public Item(String id, String displayName, String description)
+    public TypeSelectorItem(String id, String displayName, String description)
     {
         this.id = id;
         this.displayName = displayName;
diff --git a/src/main/java/eva2/gui/editor/ObjectArrayEditor.java b/src/main/java/eva2/gui/editor/ObjectArrayEditor.java
index b54e969b..362caca1 100644
--- a/src/main/java/eva2/gui/editor/ObjectArrayEditor.java
+++ b/src/main/java/eva2/gui/editor/ObjectArrayEditor.java
@@ -78,7 +78,7 @@ public class ObjectArrayEditor<T> extends JPanel implements PropertyEditor {
         add(scrollPane, c);
 
         addButton.addActionListener(event -> {
-            String className = ((Item) typeSelector.getSelectedItem()).getId();
+            String className = ((TypeSelectorItem) typeSelector.getSelectedItem()).getId();
             try {
                 T n = (T) Class.forName(className).newInstance();
                 listModel.addElement(n);
diff --git a/src/test/java/eva2/gui/TypeSelectorItemTest.java b/src/test/java/eva2/gui/TypeSelectorItemTest.java
new file mode 100644
index 00000000..4ac5e135
--- /dev/null
+++ b/src/test/java/eva2/gui/TypeSelectorItemTest.java
@@ -0,0 +1,40 @@
+package eva2.gui;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class TypeSelectorItemTest {
+    TypeSelectorItem item;
+
+    @Before
+    public void setUp() throws Exception {
+        item = new TypeSelectorItem(
+                "eva2.problem.AbstractProblemDouble",
+                "AbstractProblemDouble",
+                "An abstract problem"
+        );
+    }
+
+    @Test
+    public void testGetId() throws Exception {
+        assertEquals("eva2.problem.AbstractProblemDouble", item.getId());
+    }
+
+    @Test
+    public void testGetDescription() throws Exception {
+        assertEquals("An abstract problem", item.getDescription());
+    }
+
+    @Test
+    public void testGetDisplayName() throws Exception {
+        assertEquals("AbstractProblemDouble", item.getDisplayName());
+    }
+
+    @Test
+    public void testToString() throws Exception {
+        // Should match the id
+        assertEquals("eva2.problem.AbstractProblemDouble", item.toString());
+    }
+}
\ No newline at end of file