diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/MaterialPanel.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/MaterialPanel.java
index b7615e8f2..f99b6c4ff 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/MaterialPanel.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/MaterialPanel.java
@@ -4,7 +4,7 @@ import info.openrocket.core.material.MaterialGroup;
 import info.openrocket.core.util.Invalidatable;
 import info.openrocket.swing.gui.dialogs.preferences.PreferencesDialog;
 import info.openrocket.swing.gui.main.BasicFrame;
-import info.openrocket.swing.gui.widgets.SearchableAndGroupableComboBox;
+import info.openrocket.swing.gui.widgets.GroupableAndSearchableComboBox;
 import net.miginfocom.swing.MigLayout;
 
 import info.openrocket.core.document.OpenRocketDocument;
@@ -36,7 +36,7 @@ import java.util.List;
 public class MaterialPanel extends JPanel implements Invalidatable, InvalidatingWidget {
     private static final Translator trans = Application.getTranslator();
     private final List<Invalidatable> invalidatables = new ArrayList<>();
-    private SearchableAndGroupableComboBox<MaterialGroup, Material> materialCombo = null;
+    private GroupableAndSearchableComboBox<MaterialGroup, Material> materialCombo = null;
 
     public MaterialPanel(RocketComponent component, OpenRocketDocument document,
                          Material.Type type, String materialString, String finishString,
@@ -160,9 +160,9 @@ public class MaterialPanel extends JPanel implements Invalidatable, Invalidating
     public static class MaterialComboBox extends JComboBox<Material> {
         private static final Translator trans = Application.getTranslator();
 
-        public static SearchableAndGroupableComboBox<MaterialGroup, Material> createComboBox(
+        public static GroupableAndSearchableComboBox<MaterialGroup, Material> createComboBox(
                 MaterialModel mm, Component... extraCategoryWidgets) {
-            return new SearchableAndGroupableComboBox<>(mm,
+            return new GroupableAndSearchableComboBox<>(mm,
                     trans.get("MaterialPanel.MaterialComboBox.placeholder"), extraCategoryWidgets) {
                 @Override
                 public String getDisplayString(Material item) {
diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java
index 859f6c3e9..8fad7baaa 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java
@@ -1,6 +1,6 @@
 package info.openrocket.swing.gui.simulation;
 
-import info.openrocket.swing.gui.widgets.SearchableAndGroupableComboBox;
+import info.openrocket.swing.gui.widgets.GroupableAndSearchableComboBox;
 import info.openrocket.core.l10n.Translator;
 import info.openrocket.core.simulation.FlightDataType;
 import info.openrocket.core.simulation.FlightDataTypeGroup;
@@ -17,8 +17,8 @@ import java.util.Map;
 public class FlightDataComboBox extends JComboBox<FlightDataType> {
 	private static final Translator trans = Application.getTranslator();
 
-	public static SearchableAndGroupableComboBox<FlightDataTypeGroup, FlightDataType> createComboBox(List<FlightDataType> types) {
-		return new SearchableAndGroupableComboBox<>(types, trans.get("FlightDataComboBox.placeholder"));
+	public static GroupableAndSearchableComboBox<FlightDataTypeGroup, FlightDataType> createComboBox(List<FlightDataType> types) {
+		return new GroupableAndSearchableComboBox<>(types, trans.get("FlightDataComboBox.placeholder"));
 	}
 
 	/**
diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndGroupableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
similarity index 97%
rename from swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndGroupableComboBox.java
rename to swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
index 9c6d91f9d..456feae42 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndGroupableComboBox.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
@@ -14,7 +14,6 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JMenu;
-import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
@@ -60,7 +59,7 @@ import java.util.Vector;
  *
  * @author Sibo Van Gool <sibo.vangool@hotmail.com>
  */
-public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable<G>> extends JComboBox<T> {
+public class GroupableAndSearchableComboBox<G extends Group, T extends Groupable<G>> extends JComboBox<T> {
 	private static final String CHECKMARK = "\u2713";
 	private static final int CHECKMARK_X_OFFSET = 5;
 	private static final int CHECKMARK_Y_OFFSET = 5;
@@ -89,7 +88,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 	 * @param placeHolderText the placeholder text for the search field (when no text is entered)
 	 * @param extraGroupPopupWidgets extra widgets to add to the groups popup. Each widget will be added as a separate menu item.
 	 */
-	public SearchableAndGroupableComboBox(ComboBoxModel<T> model, String placeHolderText,
+	public GroupableAndSearchableComboBox(ComboBoxModel<T> model, String placeHolderText,
 										  Component... extraGroupPopupWidgets) {
 		super(model != null ? model : new DefaultComboBoxModel<>());
 		List<T> items = new ArrayList<>();
@@ -100,7 +99,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 		init(model, constructItemGroupMapFromList(items), placeHolderText, extraGroupPopupWidgets);
 	}
 
-	public SearchableAndGroupableComboBox(List<T> allItems, String placeHolderText, Component... extraGroupPopupWidgets) {
+	public GroupableAndSearchableComboBox(List<T> allItems, String placeHolderText, Component... extraGroupPopupWidgets) {
 		super();
 
 		init(null, constructItemGroupMapFromList(allItems), placeHolderText, extraGroupPopupWidgets);
@@ -124,7 +123,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 
 	private static void initColors() {
 		updateColors();
-		UITheme.Theme.addUIThemeChangeListener(SearchableAndGroupableComboBox::updateColors);
+		UITheme.Theme.addUIThemeChangeListener(GroupableAndSearchableComboBox::updateColors);
 	}
 
 	private static void updateColors() {
@@ -226,7 +225,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 				public void paintComponent(Graphics g) {
 					super.paintComponent(g);
 					// If the group contains the selected item, draw a checkbox
-					if (containsSelectedItem(group, (T) SearchableAndGroupableComboBox.this.getSelectedItem())) {
+					if (containsSelectedItem(group, (T) GroupableAndSearchableComboBox.this.getSelectedItem())) {
 						g.drawString(CHECKMARK, CHECKMARK_X_OFFSET, getHeight() - CHECKMARK_Y_OFFSET);
 					}
 				}
@@ -236,7 +235,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 			if (itemsForGroup != null) {
 				for (T item : itemsForGroup) {
 					JCheckBoxMenuItem itemMenu = new JCheckBoxMenuItem(getDisplayString(item));
-					itemMenu.setSelected(item == SearchableAndGroupableComboBox.this.getSelectedItem());
+					itemMenu.setSelected(item == GroupableAndSearchableComboBox.this.getSelectedItem());
 					itemMenu.addActionListener(e -> {
 						setSelectedItem(item);
 						fireActionEvent();
@@ -297,7 +296,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 			public void run() {
 				T selectedItem = filteredList.getSelectedValue();
 				if (selectedItem != null) {
-					SearchableAndGroupableComboBox.this.setSelectedItem(selectedItem);
+					GroupableAndSearchableComboBox.this.setSelectedItem(selectedItem);
 				}
 			}
 		});
@@ -415,7 +414,7 @@ public class SearchableAndGroupableComboBox<G extends Group, T extends Groupable
 		addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				model.setSelectedItem(SearchableAndGroupableComboBox.this.getSelectedItem());
+				model.setSelectedItem(GroupableAndSearchableComboBox.this.getSelectedItem());
 			}
 		});
 	}