diff --git a/swing/build.xml b/swing/build.xml
index 578f0994c..0fb9ded63 100644
--- a/swing/build.xml
+++ b/swing/build.xml
@@ -64,7 +64,7 @@
 	<target name="clean" description="Removes all build artifacts">
 		<delete dir="${build.dir}"/>
 		<delete dir="${tmp.dir}/"/>
-		<delete dir="${resources.dir}/datafiles/presets"/>
+		<delete dir="${resources.dir}/datafiles/components"/>
 	</target>
 		
 	
@@ -144,7 +144,7 @@
 				classpathref="run-classpath"
 				failonerror="true">
 				<arg value="@{dir}"/>
-				<arg value="${resources-src.dir}/datafiles/presets/@{vendor}.orc"/>
+				<arg value="${resources-src.dir}/datafiles/components/@{vendor}.orc"/>
 			</java>
 		</sequential>
 	</macrodef>
@@ -201,15 +201,15 @@ the .jar file
 				</not>
 			</condition>
 	  	</fail>
-	  	<copy todir="${resources.dir}/datafiles/presets">
+	  	<copy todir="${resources.dir}/datafiles/components">
 			<fileset dir="${resources-src.dir}/datafiles/legacy_components"/>
 	  	</copy>
-	  	<copy todir="${resources.dir}/datafiles/presets">
+	  	<copy todir="${resources.dir}/datafiles/components">
 			<fileset dir="${resources-src.dir}/datafiles/components/orc"/>
 	  	</copy>
 	  	<copy
 		    file="${resources-src.dir}/datafiles/components/LICENSE"
-		    todir="${resources.dir}/datafiles/presets">
+		    todir="${resources.dir}/datafiles/components">
 	  	</copy>
 	</target>
 
diff --git a/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java b/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
index f91706838..7ba2ee72f 100644
--- a/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
+++ b/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
@@ -28,7 +28,7 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
 	
 	private final static Logger log = LoggerFactory.getLogger(ComponentPresetDatabaseLoader.class);
 	
-	private static final String SYSTEM_PRESET_DIR = "datafiles/presets";
+	private static final String SYSTEM_PRESET_DIR = "datafiles/components";
 	private int fileCount = 0;
 	private int presetCount = 0;