diff --git a/src/ooxml/java/org/apache/poi/hslf/HSLFXML.java b/src/ooxml/java/org/apache/poi/xslf/HSLFXML.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/hslf/HSLFXML.java
rename to src/ooxml/java/org/apache/poi/xslf/HSLFXML.java
diff --git a/src/ooxml/java/org/apache/poi/hslf/extractor/HXFPowerPointExtractor.java b/src/ooxml/java/org/apache/poi/xslf/extractor/HXFPowerPointExtractor.java
similarity index 99%
rename from src/ooxml/java/org/apache/poi/hslf/extractor/HXFPowerPointExtractor.java
rename to src/ooxml/java/org/apache/poi/xslf/extractor/HXFPowerPointExtractor.java
index 1d4b1a2bd4..bfa59e32cd 100644
--- a/src/ooxml/java/org/apache/poi/hslf/extractor/HXFPowerPointExtractor.java
+++ b/src/ooxml/java/org/apache/poi/xslf/extractor/HXFPowerPointExtractor.java
@@ -42,7 +42,7 @@ public class HXFPowerPointExtractor extends POIXMLTextExtractor {
 	
 	public HXFPowerPointExtractor(Package container) throws XmlException, OpenXML4JException, IOException {
 		this(new HSLFXMLSlideShow(
-				new HSLFXML(container)
+				new XSLFXML(container)
 		));
 	}
 	public HXFPowerPointExtractor(HSLFXMLSlideShow slideshow) {
diff --git a/src/ooxml/java/org/apache/poi/hslf/usermodel/HSLFXMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/HSLFXMLSlideShow.java
similarity index 92%
rename from src/ooxml/java/org/apache/poi/hslf/usermodel/HSLFXMLSlideShow.java
rename to src/ooxml/java/org/apache/poi/xslf/usermodel/HSLFXMLSlideShow.java
index b8a5fcde35..f4360bfff5 100644
--- a/src/ooxml/java/org/apache/poi/hslf/usermodel/HSLFXMLSlideShow.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/HSLFXMLSlideShow.java
@@ -26,14 +26,14 @@ import org.apache.poi.hslf.HSLFXML;
  *  top level object for creating new slides/etc.
  */
 public class HSLFXMLSlideShow extends POIXMLDocument {
-	private org.apache.poi.hslf.HSLFXML hslfXML;
+	private org.apache.poi.hslf.XSLFXML hslfXML;
 	
-	public HSLFXMLSlideShow(HSLFXML xml) {
+	public HSLFXMLSlideShow(XSLFXML xml) {
 		super(xml);
 		this.hslfXML = xml;
 	}
 	
-	public HSLFXML _getHSLFXML() {
+	public XSLFXML _getHSLFXML() {
 		return hslfXML;
 	}
 }
diff --git a/src/ooxml/java/org/apache/poi/hwpf/HWPFXML.java b/src/ooxml/java/org/apache/poi/xwpf/HWPFXML.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/hwpf/HWPFXML.java
rename to src/ooxml/java/org/apache/poi/xwpf/HWPFXML.java
diff --git a/src/ooxml/java/org/apache/poi/hwpf/extractor/HXFWordExtractor.java b/src/ooxml/java/org/apache/poi/xwpf/extractor/HXFWordExtractor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/hwpf/extractor/HXFWordExtractor.java
rename to src/ooxml/java/org/apache/poi/xwpf/extractor/HXFWordExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/hwpf/usermodel/HWPFXMLDocument.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/HWPFXMLDocument.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/hwpf/usermodel/HWPFXMLDocument.java
rename to src/ooxml/java/org/apache/poi/xwpf/usermodel/HWPFXMLDocument.java
diff --git a/src/ooxml/testcases/org/apache/poi/hslf/TestHSLFXML.java b/src/ooxml/testcases/org/apache/poi/xslf/TestHSLFXML.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/hslf/TestHSLFXML.java
rename to src/ooxml/testcases/org/apache/poi/xslf/TestHSLFXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/hslf/extractor/TestHXFPowerPointExtractor.java b/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestHXFPowerPointExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/hslf/extractor/TestHXFPowerPointExtractor.java
rename to src/ooxml/testcases/org/apache/poi/xslf/extractor/TestHXFPowerPointExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/hwpf/TestHWPFXML.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestHWPFXML.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/hwpf/TestHWPFXML.java
rename to src/ooxml/testcases/org/apache/poi/xwpf/TestHWPFXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/hwpf/extractor/TestHXFWordExtractor.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestHXFWordExtractor.java
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/hwpf/extractor/TestHXFWordExtractor.java
rename to src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestHXFWordExtractor.java