diff --git a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
index 0b88640ca..d5c1f3731 100644
--- a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
+++ b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java
@@ -13,7 +13,7 @@ import org.xml.sax.helpers.DefaultHandler;
 
 /**
  * The actual SAX handler class.  Contains the necessary methods for parsing the SAX source.
- * Delegates the actual content parsing to {@link AbstractElementHandler} objects.
+ * Delegates the actual content parsing to {@link ElementHandler} objects.
  */
 class DelegatorHandler extends DefaultHandler {
 	private final WarningSet warnings;
@@ -27,7 +27,7 @@ class DelegatorHandler extends DefaultHandler {
 	private int ignore = 0;
 	
 	
-	public DelegatorHandler(AbstractElementHandler initialHandler, WarningSet warnings) {
+	public DelegatorHandler(ElementHandler initialHandler, WarningSet warnings) {
 		this.warnings = warnings;
 		handlerStack.add(initialHandler);
 		elementData.add(new StringBuilder()); // Just in case
diff --git a/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java b/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java
index 62dc35a9b..ec17b7751 100644
--- a/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java
+++ b/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java
@@ -16,14 +16,14 @@ import org.xml.sax.helpers.XMLReaderFactory;
  * both.  This holds true for both the OpenRocket and RockSim design formats and the
  * RockSim engine definition format.
  * <p>
- * The actual handling is performed by subclasses of {@link AbstractElementHandler}.  The 
- * initial handler is provided to the {@link #readXML(InputSource, AbstractElementHandler, WarningSet)}
+ * The actual handling is performed by subclasses of {@link ElementHandler}.  The 
+ * initial handler is provided to the {@link #readXML(InputSource, ElementHandler, WarningSet)}
  * method.
  * 
  * @author Sampo Niskanen <sampo.niskanen@iki.fi>
  */
 public class SimpleSAX {
-
+	
 	/**
 	 * Read a simple XML file.
 	 * 
@@ -33,11 +33,11 @@ public class SimpleSAX {
 	 * @throws IOException		if an I/O exception occurs while reading.
 	 * @throws SAXException		if e.g. malformed XML is encountered.
 	 */
-	public static void readXML(InputSource source, AbstractElementHandler initialHandler,
+	public static void readXML(InputSource source, ElementHandler initialHandler,
 			WarningSet warnings) throws IOException, SAXException {
-
+		
 		DelegatorHandler xmlhandler = new DelegatorHandler(initialHandler, warnings);
-
+		
 		XMLReader reader = XMLReaderFactory.createXMLReader();
 		reader.setContentHandler(xmlhandler);
 		reader.setErrorHandler(xmlhandler);