diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index f43fb4545..14932a2eb 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -70,7 +70,7 @@ import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.startup.Preferences;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.AlphanumComparator;
-import net.sf.openrocket.utils.SimulationTableToCSVFileExporter;
+import net.sf.openrocket.utils.SimulationTableCSVExport;
 import net.sf.openrocket.utils.TableRowTraversalPolicy;
 
 @SuppressWarnings("serial")
@@ -623,9 +623,8 @@ public class SimulationPanel extends JPanel {
 
 		@Override
 		public void actionPerformed(ActionEvent arg0) {
-			SimulationTableToCSVFileExporter exporter = new SimulationTableToCSVFileExporter(document, simulationTable, simulationTableModel);
+			SimulationTableCSVExport exporter = new SimulationTableCSVExport(document, simulationTable, simulationTableModel);
 			exporter.performTableDataConversion();
-			return;
 		}
 
 		@Override
diff --git a/swing/src/net/sf/openrocket/utils/SimulationTableToCSVFileExporter.java b/swing/src/net/sf/openrocket/utils/SimulationTableCSVExport.java
similarity index 98%
rename from swing/src/net/sf/openrocket/utils/SimulationTableToCSVFileExporter.java
rename to swing/src/net/sf/openrocket/utils/SimulationTableCSVExport.java
index fc1e253b5..6afde728c 100644
--- a/swing/src/net/sf/openrocket/utils/SimulationTableToCSVFileExporter.java
+++ b/swing/src/net/sf/openrocket/utils/SimulationTableCSVExport.java
@@ -30,7 +30,7 @@ import net.sf.openrocket.startup.Preferences;
 import net.sf.openrocket.unit.Value;
 import net.sf.openrocket.util.TextUtil;
 
-public class SimulationTableToCSVFileExporter {
+public class SimulationTableCSVExport {
 	private final OpenRocketDocument document;
 	private final JTable simulationTable;
 	private final ColumnTableModel simulationTableModel;
@@ -40,7 +40,7 @@ public class SimulationTableToCSVFileExporter {
 	private static final String SPACE = "SPACE";
 	private static final String TAB = "TAB";
 
-	public SimulationTableToCSVFileExporter (OpenRocketDocument document,
+	public SimulationTableCSVExport (OpenRocketDocument document,
 			JTable simulationTable,
 			ColumnTableModel simulationTableModel			
 			) 
@@ -109,7 +109,7 @@ public class SimulationTableToCSVFileExporter {
 		String documentFileName = document.getRocket().getName();
 		documentFileName += ".csv";
 		fch.setSelectedFile(new File(documentFileName));
-		CsvOptionPanel csvOptions = new CsvOptionPanel(SimulationTableToCSVFileExporter.class /*,
+		CsvOptionPanel csvOptions = new CsvOptionPanel(SimulationTableCSVExport.class /*,
 				trans.get("GeneralOptimizationDialog.export.header"), trans.get("GeneralOptimizationDialog.export.header.ttip")*/);
 
 		fch.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());