try to fix some jdk 14 build issues due to java.lang.Record causing existing POI Record classes to be ambiguous

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1872610 13f79535-47bb-0310-9956-ffa450edef68

47 files changed, 157 insertions, 157 deletions

diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
index 7e5f3e26bc..e80cbc18ec 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
@@ -75,7 +75,7 @@ public final class SlideIdListing {
             SlideListWithText[] slwts = document.getSlideListWithTexts();
             for (SlideListWithText slwt : slwts) {
                 Record[] cr = slwt.getChildRecords();
-                for (Record record : cr) {
+                for (org.apache.poi.hslf.record.Record record : cr) {
                     if (record instanceof SlidePersistAtom) {
                         SlidePersistAtom spa = (SlidePersistAtom) record;
                         System.out.println("SlidePersistAtom knows about slide:");
@@ -117,7 +117,7 @@ public final class SlideIdListing {
 
             // Find any persist ones first
             int pos = 0;
-            for (Record r : records) {
+            for (org.apache.poi.hslf.record.Record r : records) {
                 if (r.getRecordType() == 6001L) {
                     // PersistPtrFullBlock
                     System.out.println("Found PersistPtrFullBlock at " + pos + " (" + Integer.toHexString(pos) + ")");
@@ -159,7 +159,7 @@ public final class SlideIdListing {
 
 
     // Finds the record at a given position
-    public static Record findRecordAtPos(int pos) {
+    public static org.apache.poi.hslf.record.Record findRecordAtPos(int pos) {
         long type = LittleEndian.getUShort(fileContents, pos+2);
         long rlen = LittleEndian.getUInt(fileContents, pos+4);
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
index 86c2335146..d1699779f0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
@@ -146,7 +146,7 @@ public final class SlideShowRecordDumper {
         return ret.toString();
     }
 
-    public int getDiskLen(Record r) throws IOException {
+    public int getDiskLen(org.apache.poi.hslf.record.Record r) throws IOException {
         int diskLen = 0;
         if (r != null) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -156,7 +156,7 @@ public final class SlideShowRecordDumper {
         return diskLen;
     }
 
-    public String getPrintableRecordContents(Record r) throws IOException {
+    public String getPrintableRecordContents(org.apache.poi.hslf.record.Record r) throws IOException {
         if (r == null) {
             return "<<null>>";
         }
@@ -228,7 +228,7 @@ public final class SlideShowRecordDumper {
     public void walkTree(int depth, int pos, Record[] records, int indent) throws IOException {
         String ind = tabs.substring(0, indent);
 
-        for (Record r : records) {
+        for (org.apache.poi.hslf.record.Record r : records) {
             if (r == null) {
                 ps.println(ind + "At position " + pos + " (" + makeHex(pos, 6) + "):");
                 ps.println(ind + "Warning! Null record found.");
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
index c040499b0d..8df3ef0f01 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
@@ -44,7 +44,7 @@ public final class TextStyleListing {
 		try (HSLFSlideShowImpl ss = new HSLFSlideShowImpl(args[0])) {
 			// Find the documents, and then their SLWT
 			Record[] records = ss.getRecords();
-			for (Record record : records) {
+			for (org.apache.poi.hslf.record.Record record : records) {
 				if (record.getRecordType() == 1000L) {
 					Record[] docChildren = record.getChildRecords();
 					for (Record docChild : docChildren) {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
index e50a23aac9..116582e7f3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
@@ -50,7 +50,7 @@ public final class UserEditAndPersistListing {
 
 			// Find any persist ones first
 			int pos = 0;
-			for (Record r : ss.getRecords()) {
+			for (org.apache.poi.hslf.record.Record r : ss.getRecords()) {
 				if (r.getRecordType() == 6001L) {
 					// PersistPtrFullBlock
 					System.out.println("Found PersistPtrFullBlock at " + pos + " (" + Integer.toHexString(pos) + ")");
@@ -88,7 +88,7 @@ public final class UserEditAndPersistListing {
 
 			pos = 0;
 			// Now look for UserEditAtoms
-			for (Record r : ss.getRecords()) {
+			for (org.apache.poi.hslf.record.Record r : ss.getRecords()) {
 				if (r instanceof UserEditAtom) {
 					UserEditAtom uea = (UserEditAtom) r;
 					System.out.println("Found UserEditAtom at " + pos + " (" + Integer.toHexString(pos) + ")");
@@ -118,7 +118,7 @@ public final class UserEditAndPersistListing {
 
 
 	// Finds the record at a given position
-	public static Record findRecordAtPos(int pos) {
+	public static org.apache.poi.hslf.record.Record findRecordAtPos(int pos) {
 		long type = LittleEndian.getUShort(fileContents, pos+2);
 		long rlen = LittleEndian.getUInt(fileContents, pos+4);
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java b/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
index e9dc5cd955..01f641d303 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
@@ -71,7 +71,7 @@ public final class AnimationInfo extends RecordContainer {
 		_header[0] = 0x0f; // We are a container record
 		LittleEndian.putShort(_header, 2, (short)getRecordType());
 
-        _children = new Record[1];
+        _children = new org.apache.poi.hslf.record.Record[1];
 		_children[0] = animationAtom = new AnimationInfoAtom();
 	}
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java b/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
index 9dc836bf53..ed8237b38f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
@@ -105,7 +105,7 @@ public final class Comment2000 extends RecordContainer {
 		System.arraycopy(source,start,_header,0,8);
 
 		// Find our children
-		_children = Record.findChildRecords(source,start+8,len-8);
+		_children = org.apache.poi.hslf.record.Record.findChildRecords(source,start+8,len-8);
 		findInterestingChildren();
 	}
 
@@ -116,7 +116,7 @@ public final class Comment2000 extends RecordContainer {
 	 */
 	private void findInterestingChildren() {
 
-        for(Record r : _children){
+        for(org.apache.poi.hslf.record.Record r : _children){
             if (r instanceof CString){
                 CString cs = (CString)r;
                 int recInstance = cs.getOptions() >> 4;
@@ -140,7 +140,7 @@ public final class Comment2000 extends RecordContainer {
 	 */
 	public Comment2000() {
 		_header = new byte[8];
-		_children = new Record[4];
+		_children = new org.apache.poi.hslf.record.Record[4];
 
 		// Setup our header block
 		_header[0] = 0x0f; // We are a container record
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java b/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java
index e046161f41..e10e864724 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java
@@ -60,7 +60,7 @@ public final class DocInfoListContainer extends RecordContainer {
 	 */
 	private DocInfoListContainer() {
 		_header = new byte[8];
-		_children = new Record[0];
+		_children = new org.apache.poi.hslf.record.Record[0];
 
 		// Setup our header block
 		_header[0] = 0x0f; // We are a container record
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java b/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
index 783c59e496..7cfe763f98 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
@@ -57,7 +57,7 @@ public final class EscherTextboxWrapper extends RecordContainer {
 		// Find the child records in the escher data
 		byte[] data = _escherRecord.getData();
 		_children = Record.findChildRecords(data,0,data.length);
-		for (Record r : this._children) {
+		for (org.apache.poi.hslf.record.Record r : this._children) {
 			if (r instanceof StyleTextPropAtom) { this.styleTextPropAtom = (StyleTextPropAtom) r; }
 		}
 	}
@@ -70,7 +70,7 @@ public final class EscherTextboxWrapper extends RecordContainer {
 		_escherRecord.setRecordId(EscherTextboxRecord.RECORD_ID);
 		_escherRecord.setOptions((short)15);
 
-		_children = new Record[0];
+		_children = new org.apache.poi.hslf.record.Record[0];
 	}
 
 
@@ -90,7 +90,7 @@ public final class EscherTextboxWrapper extends RecordContainer {
 
 		// Grab the children's data
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		for (Record r : _children) r.writeOut(baos);
+		for (org.apache.poi.hslf.record.Record r : _children) r.writeOut(baos);
 		byte[] data = baos.toByteArray();
 
 		// Save in the escher layer
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
index 2449adb6c9..099aeb854b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
@@ -34,7 +34,7 @@ public class ExEmbed extends RecordContainer {
     private final byte[] _header;
 
     // Links to our more interesting children
-    private RecordAtom embedAtom;
+    public org.apache.poi.hslf.record.RecordAtom embedAtom;
     private ExOleObjAtom oleObjAtom;
     private CString menuName;
     private CString progId;
@@ -74,7 +74,7 @@ public class ExEmbed extends RecordContainer {
      */
     public ExEmbed() {
         _header = new byte[8];
-        _children = new Record[5];
+        _children = new org.apache.poi.hslf.record.Record[5];
 
         // Setup our header block
         _header[0] = 0x0f; // We are a container record
@@ -222,7 +222,7 @@ public class ExEmbed extends RecordContainer {
         }
 
         boolean found = false;
-        for (final Record r : _children) {
+        for (final org.apache.poi.hslf.record.Record r : _children) {
             // for simplicity just check for object identity
             if (r == newStr) {
                 found = true;
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
index da25e248bf..37c47824e4 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
@@ -137,7 +137,7 @@ public class ExHyperlink extends RecordContainer {
 	 */
 	public ExHyperlink() {
 		_header = new byte[8];
-		_children = new Record[3];
+		_children = new org.apache.poi.hslf.record.Record[3];
 		
 		// Setup our header block
 		_header[0] = 0x0f; // We are a container record
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
index 7d24175879..b83e0f8184 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
@@ -57,7 +57,7 @@ public class ExMCIMovie extends RecordContainer { // TODO - instantiable supercl
         LittleEndian.putShort(_header, 2, (short) getRecordType());
 
         exVideo = new ExVideoContainer();
-        _children = new Record[]{exVideo};
+        _children = new org.apache.poi.hslf.record.Record[]{exVideo};
 
     }
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
index 1c5fb4c4c4..f57461cf18 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
@@ -85,7 +85,7 @@ public class ExObjList extends RecordContainer {
 	 */
 	public ExObjList() {
 		_header = new byte[8];
-		_children = new Record[1];
+		_children = new org.apache.poi.hslf.record.Record[1];
 		
 		// Setup our header block
 		_header[0] = 0x0f; // We are a container record
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
index 473201f26c..1e9031cba2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
@@ -78,7 +78,7 @@ public final class ExVideoContainer extends RecordContainer {
 		_header[0] = 0x0f; // We are a container record
 		LittleEndian.putShort(_header, 2, (short)getRecordType());
 
-        _children = new Record[2];
+        _children = new org.apache.poi.hslf.record.Record[2];
 		_children[0] = mediaAtom = new ExMediaAtom();
 		_children[1] = pathAtom = new CString();
 	}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java b/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
index c712753800..4bd0b0547c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
@@ -52,7 +52,7 @@ public final class FontCollection extends RecordContainer {
 
 		_children = Record.findChildRecords(source,start+8,len-8);
 
-		for (Record r : _children){
+		for (org.apache.poi.hslf.record.Record r : _children){
 			if(r instanceof FontEntityAtom) {
                 HSLFFontInfo fi = new HSLFFontInfo((FontEntityAtom) r);
                 fonts.put(fi.getIndex(), fi);
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
index 28043ce281..3f1b0fbe3d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
@@ -41,7 +41,7 @@ public class HSLFEscherClientDataRecord extends EscherClientDataRecord {
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 1_000_000;
 
-    private final List<Record> _childRecords = new ArrayList<>();
+    private final List<org.apache.poi.hslf.record.Record> _childRecords = new ArrayList<>();
 
     public HSLFEscherClientDataRecord() {}
 
@@ -99,7 +99,7 @@ public class HSLFEscherClientDataRecord extends EscherClientDataRecord {
     public byte[] getRemainingData() {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         try {
-            for (Record r : _childRecords) {
+            for (org.apache.poi.hslf.record.Record r : _childRecords) {
                 r.writeOut(bos);
             }
         } catch (IOException e) {
@@ -113,7 +113,7 @@ public class HSLFEscherClientDataRecord extends EscherClientDataRecord {
         _childRecords.clear();
         int offset = 0;
         while (offset < remainingData.length) {
-            final Record r = Record.buildRecordAtOffset(remainingData, offset);
+            final org.apache.poi.hslf.record.Record r = Record.buildRecordAtOffset(remainingData, offset);
             if (r != null) {
                 _childRecords.add(r);
             }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java b/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
index c7aa32876b..b974bb35bb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
@@ -104,7 +104,7 @@ public final class HeadersFootersContainer extends RecordContainer {
         LittleEndian.putShort(_header, 2, (short)getRecordType());
 
         hdAtom = new HeadersFootersAtom();
-        _children = new Record[]{
+        _children = new org.apache.poi.hslf.record.Record[]{
             hdAtom
         };
         csDate = csHeader = csFooter = null;
@@ -198,7 +198,7 @@ public final class HeadersFootersContainer extends RecordContainer {
         csHeader = new CString();
         csHeader.setOptions(HEADERATOM << 4);
 
-        Record r = hdAtom;
+        org.apache.poi.hslf.record.Record r = hdAtom;
         if(csDate != null) r = hdAtom;
         addChildAfter(csHeader, r);
 
@@ -216,7 +216,7 @@ public final class HeadersFootersContainer extends RecordContainer {
         csFooter = new CString();
         csFooter.setOptions(FOOTERATOM << 4);
 
-        Record r = hdAtom;
+        org.apache.poi.hslf.record.Record r = hdAtom;
         if(csHeader != null) r = csHeader;
         else if(csDate != null) r = csDate;
         addChildAfter(csFooter, r);
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java b/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
index 9c0962c644..440005b479 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
@@ -73,7 +73,7 @@ public class InteractiveInfo extends RecordContainer {
 	 */
 	public InteractiveInfo() {
 		_header = new byte[8];
-		_children = new Record[1];
+		_children = new org.apache.poi.hslf.record.Record[1];
 		
 		// Setup our header block
 		_header[0] = 0x0f; // We are a container record
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
index 01bb78eb7e..2bb40a812a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
@@ -168,7 +168,7 @@ public final class PPDrawing extends RecordAtom implements Iterable<EscherRecord
 			findFirst();
 	}
 
-	private static Stream<StyleTextProp9Atom> findInProgBinaryTag(Record r) {
+	private static Stream<StyleTextProp9Atom> findInProgBinaryTag(org.apache.poi.hslf.record.Record r) {
 		Record[] ch = r.getChildRecords();
 		if (ch != null &&
 			ch.length == 2 &&
@@ -253,7 +253,7 @@ public final class PPDrawing extends RecordAtom implements Iterable<EscherRecord
 	/**
 	 * We're pretending to be an atom, so return null
 	 */
-	public Record[] getChildRecords() { return null; }
+	public org.apache.poi.hslf.record.Record[] getChildRecords() { return null; }
 
 	/**
 	 * Write the contents of the record back, so it can be written
@@ -396,7 +396,7 @@ public final class PPDrawing extends RecordAtom implements Iterable<EscherRecord
 		return GenericRecordUtil.getGenericProperties("escherRecords", this::getEscherRecords);
 	}
 
-	private static Predicate<Record> sameHSLF(RecordTypes type) {
+	private static Predicate<org.apache.poi.hslf.record.Record> sameHSLF(RecordTypes type) {
 		return (p) -> p.getRecordType() == type.typeID;
 	}
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
index 8f244607b0..672be6c0cf 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
@@ -73,7 +73,7 @@ public final class PPDrawingGroup extends RecordAtom {
     /**
      * We're pretending to be an atom, so return null
      */
-    public Record[] getChildRecords() {
+    public org.apache.poi.hslf.record.Record[] getChildRecords() {
         return null;
     }
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java b/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
index c71699f35b..b2d84373cb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
@@ -24,6 +24,6 @@ package org.apache.poi.hslf.record;
  * @author Nick Burch (nick at torchbox dot com)
  */
 public interface ParentAwareRecord {
-	public RecordContainer getParentRecord();
+	public org.apache.poi.hslf.record.RecordContainer getParentRecord();
 	public void setParentRecord(RecordContainer parentRecord);
 }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
index fb241568fb..cf6b738ddb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
@@ -79,7 +79,7 @@ public abstract class Record implements GenericRecord
 	}
 
 	@Override
-	public List<Record> getGenericChildren() {
+	public List<org.apache.poi.hslf.record.Record> getGenericChildren() {
 		Record[] recs = getChildRecords();
 		return (recs == null) ? null : Arrays.asList(recs);
 	}
@@ -107,7 +107,7 @@ public abstract class Record implements GenericRecord
 	 * @param b The byte array to build from
 	 * @param offset The offset to build at
 	 */
-	public static Record buildRecordAtOffset(byte[] b, int offset) {
+	public static org.apache.poi.hslf.record.Record buildRecordAtOffset(byte[] b, int offset) {
 		long type = LittleEndian.getUShort(b,offset+2);
 		long rlen = LittleEndian.getUInt(b,offset+4);
 
@@ -122,7 +122,7 @@ public abstract class Record implements GenericRecord
 	 * Default method for finding child records of a container record
 	 */
 	public static Record[] findChildRecords(byte[] b, int start, int len) {
-		List<Record> children = new ArrayList<>(5);
+		List<org.apache.poi.hslf.record.Record> children = new ArrayList<>(5);
 
 		// Jump our little way along, creating records as we go
 		int pos = start;
@@ -149,7 +149,7 @@ public abstract class Record implements GenericRecord
 		}
 
 		// Turn the vector into an array, and return
-        return children.toArray(new Record[0]);
+        return children.toArray(new org.apache.poi.hslf.record.Record[0]);
 	}
 
 	/**
@@ -161,7 +161,7 @@ public abstract class Record implements GenericRecord
 	 *  (not including the size of the header), this code assumes you're
 	 *  passing in corrected lengths
 	 */
-	public static Record createRecordForType(long type, byte[] b, int start, int len) {
+	public static org.apache.poi.hslf.record.Record createRecordForType(long type, byte[] b, int start, int len) {
 		// We use the RecordTypes class to provide us with the right
 		//  class to use for a given type
 		// A spot of reflection gets us the (byte[],int,int) constructor
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
index 964d3d1c45..4de227a2c2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
@@ -33,5 +33,5 @@ public abstract class RecordAtom extends Record
 	/**
 	 * We're an atom, returns null
 	 */
-	public Record[] getChildRecords() { return null; }
+	public org.apache.poi.hslf.record.Record[] getChildRecords() { return null; }
 }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java b/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
index 546c07691b..271bb9631d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
@@ -42,7 +42,7 @@ public abstract class RecordContainer extends Record
 	 * Return any children
 	 */
 	@Override
-    public Record[] getChildRecords() { return _children; }
+    public org.apache.poi.hslf.record.Record[] getChildRecords() { return _children; }
 
 	/**
 	 * We're not an atom
@@ -61,7 +61,7 @@ public abstract class RecordContainer extends Record
 	 */
 	private int findChildLocation(Record child) {
 	    int i=0;
-		for(Record r : _children) {
+		for(org.apache.poi.hslf.record.Record r : _children) {
 			if (r.equals(child)) {
 				return i;
 			}
@@ -77,7 +77,7 @@ public abstract class RecordContainer extends Record
 	 */
 	private int appendChild(Record newChild) {
 		// Copy over, and pop the child in at the end
-		Record[] nc = new Record[(_children.length + 1)];
+		Record[] nc = new org.apache.poi.hslf.record.Record[(_children.length + 1)];
 		System.arraycopy(_children, 0, nc, 0, _children.length);
 		// Switch the arrays
 		nc[_children.length] = newChild;
@@ -125,8 +125,8 @@ public abstract class RecordContainer extends Record
 	 *  or null if none of the child records are of the
 	 *  given type. Does not descend.
 	 */
-	public Record findFirstOfType(long type) {
-		for (Record r : _children) {
+	public org.apache.poi.hslf.record.Record findFirstOfType(long type) {
+		for (org.apache.poi.hslf.record.Record r : _children) {
 			if (r.getRecordType() == type) {
 				return r;
 			}
@@ -140,17 +140,17 @@ public abstract class RecordContainer extends Record
      * @param ch the child to remove
      * @return the removed record
      */
-    public Record removeChild(Record ch) {
-        Record rm = null;
-        ArrayList<Record> lst = new ArrayList<>();
-        for(Record r : _children) {
+    public org.apache.poi.hslf.record.Record removeChild(Record ch) {
+        org.apache.poi.hslf.record.Record rm = null;
+        ArrayList<org.apache.poi.hslf.record.Record> lst = new ArrayList<>();
+        for(org.apache.poi.hslf.record.Record r : _children) {
             if(r != ch) {
                 lst.add(r);
             } else {
                 rm = r;
             }
         }
-        _children = lst.toArray(new Record[0]);
+        _children = lst.toArray(new org.apache.poi.hslf.record.Record[0]);
         return rm;
     }
 
@@ -278,7 +278,7 @@ public abstract class RecordContainer extends Record
      *
      * @param records   the new child records
      */
-    public void setChildRecord(Record[] records) {
+    public void setChildRecord(org.apache.poi.hslf.record.Record[] records) {
         this._children = records.clone();
     }
 
@@ -360,7 +360,7 @@ public abstract class RecordContainer extends Record
      */
     public static void handleParentAwareRecords(RecordContainer br) {
         // Loop over child records, looking for interesting ones
-        for (Record record : br.getChildRecords()) {
+        for (org.apache.poi.hslf.record.Record record : br.getChildRecords()) {
             // Tell parent aware records of their parent
             if (record instanceof ParentAwareRecord) {
                 ((ParentAwareRecord) record).setParentRecord(br);
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java b/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
index a833c4016a..4534de034a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
@@ -92,7 +92,7 @@ public final class Slide extends SheetContainer
 
 		ColorSchemeAtom colorAtom = new ColorSchemeAtom();
 
-		_children = new Record[] {
+		_children = new org.apache.poi.hslf.record.Record[] {
 			slideAtom,
 			ppDrawing,
 			colorAtom
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java b/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
index 268145d31c..516bbda7b0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
@@ -96,7 +96,7 @@ public final class SlideListWithText extends RecordContainer {
 
 				// Create a SlideAtomsSets, not caring if they're empty
 				//if(emptySet) { continue; }
-				Record[] spaChildren = new Record[clen];
+				org.apache.poi.hslf.record.Record[] spaChildren = new org.apache.poi.hslf.record.Record[clen];
 				System.arraycopy(_children,i+1,spaChildren,0,clen);
 				SlideAtomsSet set = new SlideAtomsSet((SlidePersistAtom)_children[i],spaChildren);
 				sets.add(set);
@@ -120,7 +120,7 @@ public final class SlideListWithText extends RecordContainer {
 		LittleEndian.putInt(_header, 4, 0);
 
 		// We have no children to start with
-		_children = new Record[0];
+		_children = new org.apache.poi.hslf.record.Record[0];
 		slideAtomsSets = new SlideAtomsSet[0];
 	}
 
@@ -133,7 +133,7 @@ public final class SlideListWithText extends RecordContainer {
 		// Add the new SlidePersistAtom at the end
 		appendChildRecord(spa);
 
-		SlideAtomsSet newSAS = new SlideAtomsSet(spa, new Record[0]);
+		SlideAtomsSet newSAS = new SlideAtomsSet(spa, new org.apache.poi.hslf.record.Record[0]);
 
 		// Update our SlideAtomsSets with this
 		SlideAtomsSet[] sas = new SlideAtomsSet[slideAtomsSets.length+1];
@@ -186,15 +186,15 @@ public final class SlideListWithText extends RecordContainer {
 	 */
 	public static class SlideAtomsSet {
 		private SlidePersistAtom slidePersistAtom;
-		private Record[] slideRecords;
+		private org.apache.poi.hslf.record.Record[] slideRecords;
 
 		/** Get the SlidePersistAtom, which gives details on the Slide this text is associated with */
 		public SlidePersistAtom getSlidePersistAtom() { return slidePersistAtom; }
 		/** Get the Text related records for this slide */
-		public Record[] getSlideRecords() { return slideRecords; }
+		public org.apache.poi.hslf.record.Record[] getSlideRecords() { return slideRecords; }
 
 		/** Create one to hold the Records for one Slide's text */
-		public SlideAtomsSet(SlidePersistAtom s, Record[] r) {
+		public SlideAtomsSet(SlidePersistAtom s, org.apache.poi.hslf.record.Record[] r) {
 			slidePersistAtom = s;
 			slideRecords = r.clone();
 		}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
index 3264b78793..3a2d01adfb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
@@ -36,7 +36,7 @@ import org.apache.poi.util.LittleEndian;
 public final class TextHeaderAtom extends RecordAtom implements ParentAwareRecord {
     public static final long _type = RecordTypes.TextHeaderAtom.typeID;
 	private byte[] _header;
-	private RecordContainer parentRecord;
+	public org.apache.poi.hslf.record.RecordContainer parentRecord;
 
 	/** The kind of text it is */
 	private int textType;
@@ -65,7 +65,7 @@ public final class TextHeaderAtom extends RecordAtom implements ParentAwareRecor
 	public void setIndex(int index) { this.index = index; }
 
 	@Override
-    public RecordContainer getParentRecord() { return parentRecord; }
+    public org.apache.poi.hslf.record.RecordContainer getParentRecord() { return parentRecord; }
 	@Override
     public void setParentRecord(RecordContainer record) { this.parentRecord = record; }
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java b/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
index 237027b088..e483ce7424 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
@@ -68,7 +68,7 @@ public final class UnknownRecordPlaceholder extends RecordAtom
 	/**
 	 * Return the value as enum we were given at creation
 	 */
-	public RecordTypes getRecordTypeEnum() {
+	public org.apache.poi.hslf.record.RecordTypes getRecordTypeEnum() {
 		return RecordTypes.forTypeID((int)_type);
 	}
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java b/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java
index 013ace9fed..cf9f6159cc 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java
@@ -59,7 +59,7 @@ public final class VBAInfoContainer extends RecordContainer {
      */
     private VBAInfoContainer() {
         _header = new byte[8];
-        _children = new Record[0];
+        _children = new org.apache.poi.hslf.record.Record[0];
 
         // Setup our header block
         _header[0] = 0x0f; // We are a container record
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
index 2385a00c4e..0df60a215e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
@@ -340,7 +340,7 @@ public final class HSLFHyperlink implements Hyperlink<HSLFShape,HSLFTextParagrap
         //document-level container which stores info about all links in a presentation
         ExObjList exobj = ppt.getDocumentRecord().getExObjList(false);
         if (exobj != null) {
-            Record[] records = firstPara.getRecords();
+            org.apache.poi.hslf.record.Record[] records = firstPara.getRecords();
             find(Arrays.asList(records), exobj, lst);
         }
 
@@ -372,7 +372,7 @@ public final class HSLFHyperlink implements Hyperlink<HSLFShape,HSLFTextParagrap
     private static void find(List<? extends Record> records, ExObjList exobj, List<HSLFHyperlink> out){
         ListIterator<? extends Record> iter = records.listIterator();
         while (iter.hasNext()) {
-            Record r = iter.next();
+            org.apache.poi.hslf.record.Record r = iter.next();
             // see if we have InteractiveInfo in the textrun's records
             if (!(r instanceof InteractiveInfo)) {
                 continue;
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
index 306da5fd41..af850ecd83 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
@@ -104,7 +104,7 @@ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectSha
 
         HSLFEscherClientDataRecord cldata = getClientData(true);
         ExObjRefAtom uer = null;
-        for (Record r : cldata.getHSLFChildRecords()) {
+        for (org.apache.poi.hslf.record.Record r : cldata.getHSLFChildRecords()) {
             if (r.getRecordType() == RecordTypes.ExObjRefAtom.typeID) {
                 uer = (ExObjRefAtom)r;
                 break;
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
index 03458c4b2a..24011cc9aa 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
@@ -715,7 +715,7 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> {
     public <T extends Record> T getClientDataRecord(int recordType) {
 
         List<? extends Record> records = getClientRecords();
-        if (records != null) for (Record r : records) {
+        if (records != null) for (org.apache.poi.hslf.record.Record r : records) {
             if (r.getRecordType() == recordType){
                 return (T)r;
             }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
index 9bd016187f..15273ddb05 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
@@ -162,7 +162,7 @@ public final class HSLFShapeFactory {
     @SuppressWarnings("unchecked")
     protected static <T extends Record> T getClientDataRecord(EscherContainerRecord spContainer, int recordType) {
         HSLFEscherClientDataRecord cldata = spContainer.getChildById(EscherClientDataRecord.RECORD_ID);
-        if (cldata != null) for (Record r : cldata.getHSLFChildRecords()) {
+        if (cldata != null) for (org.apache.poi.hslf.record.Record r : cldata.getHSLFChildRecords()) {
             if (r.getRecordType() == recordType) {
                 return (T)r;
             }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
index 519bb3ac76..dc32a2d109 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
@@ -212,7 +212,7 @@ public class HSLFShapePlaceholderDetails extends HSLFPlaceholderDetails {
             throw new HSLFException("Placeholder aren't allowed for shape type: " + shape.getClass().getSimpleName());
         }
 
-        for (Record r : clientData.getHSLFChildRecords()) {
+        for (org.apache.poi.hslf.record.Record r : clientData.getHSLFChildRecords()) {
             if (r instanceof OEPlaceholderAtom) {
                 oePlaceholderAtom = (OEPlaceholderAtom)r;
             } else if (r instanceof RoundTripHFPlaceholder12) {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
index 14d85b56f8..7d1b6711ee 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
@@ -412,7 +412,7 @@ public final class HSLFSlide extends HSLFSheet implements Slide<HSLFShape,HSLFTe
                         RecordTypes.ProgTags, RecordTypes.ProgBinaryTag, RecordTypes.BinaryTagData);
 
         if (binaryTags != null) {
-            for (final Record record : binaryTags.getChildRecords()) {
+            for (final org.apache.poi.hslf.record.Record record : binaryTags.getChildRecords()) {
                 if (record instanceof Comment2000) {
                     comments.add(new HSLFComment((Comment2000)record));
                 }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
index 5f182d5886..150326b6d0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
@@ -85,7 +85,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 
 	// Pointers to the most recent versions of the core records
 	// (Document, Notes, Slide etc)
-	private Record[] _mostRecentCoreRecords;
+	private org.apache.poi.hslf.record.Record[] _mostRecentCoreRecords;
 	// Lookup between the PersitPtr "sheet" IDs, and the position
 	// in the mostRecentCoreRecords array
 	private Map<Integer,Integer> _sheetIdToCoreRecordsLookup;
@@ -117,7 +117,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 	    _hslfSlideShow = hslfSlideShow;
 
 		// Handle Parent-aware Records
-		for (Record record : _hslfSlideShow.getRecords()) {
+		for (org.apache.poi.hslf.record.Record record : _hslfSlideShow.getRecords()) {
 			if(record instanceof RecordContainer){
                 RecordContainer.handleParentAwareRecords((RecordContainer)record);
             }
@@ -179,7 +179,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 	private void findMostRecentCoreRecords() {
 		// To start with, find the most recent in the byte offset domain
 		Map<Integer,Integer> mostRecentByBytes = new HashMap<>();
-		for (Record record : _hslfSlideShow.getRecords()) {
+		for (org.apache.poi.hslf.record.Record record : _hslfSlideShow.getRecords()) {
 			if (record instanceof PersistPtrHolder) {
 				PersistPtrHolder pph = (PersistPtrHolder) record;
 
@@ -200,7 +200,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 
 		// We now know how many unique special records we have, so init
 		// the array
-		_mostRecentCoreRecords = new Record[mostRecentByBytes.size()];
+		_mostRecentCoreRecords = new org.apache.poi.hslf.record.Record[mostRecentByBytes.size()];
 
 		// We'll also want to be able to turn the slide IDs into a position
 		// in this array
@@ -217,7 +217,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 		}
 
 		// Now convert the byte offsets back into record offsets
-		for (Record record : _hslfSlideShow.getRecords()) {
+		for (org.apache.poi.hslf.record.Record record : _hslfSlideShow.getRecords()) {
 			if (!(record instanceof PositionDependentRecord)) {
                 continue;
             }
@@ -245,7 +245,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 		}
 
 		// Now look for the interesting records in there
-		for (Record record : _mostRecentCoreRecords) {
+		for (org.apache.poi.hslf.record.Record record : _mostRecentCoreRecords) {
 			// Check there really is a record at this number
 			if (record != null) {
 				// Find the Document, and interesting things in it
@@ -264,7 +264,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 	 * For a given SlideAtomsSet, return the core record, based on the refID
 	 * from the SlidePersistAtom
 	 */
-	private Record getCoreRecordForSAS(SlideAtomsSet sas) {
+	public org.apache.poi.hslf.record.Record getCoreRecordForSAS(SlideAtomsSet sas) {
 		SlidePersistAtom spa = sas.getSlidePersistAtom();
 		int refID = spa.getRefID();
 		return getCoreRecordForRefID(refID);
@@ -277,7 +277,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 	 * @param refID
 	 *            the refID
 	 */
-	private Record getCoreRecordForRefID(int refID) {
+	public org.apache.poi.hslf.record.Record getCoreRecordForRefID(int refID) {
 		Integer coreRecordId = _sheetIdToCoreRecordsLookup.get(refID);
 		if (coreRecordId != null) {
 			return _mostRecentCoreRecords[coreRecordId];
@@ -342,7 +342,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
         }
 
         for (SlideAtomsSet sas : masterSLWT.getSlideAtomsSets()) {
-            Record r = getCoreRecordForSAS(sas);
+            org.apache.poi.hslf.record.Record r = getCoreRecordForSAS(sas);
             int sheetNo = sas.getSlidePersistAtom().getSlideIdentifier();
             if (r instanceof Slide) {
                 HSLFTitleMaster master = new HSLFTitleMaster((Slide)r, sheetNo);
@@ -368,7 +368,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
         for (SlideAtomsSet notesSet : notesSLWT.getSlideAtomsSets()) {
             idx++;
             // Get the right core record
-            Record r = getCoreRecordForSAS(notesSet);
+            org.apache.poi.hslf.record.Record r = getCoreRecordForSAS(notesSet);
             SlidePersistAtom spa = notesSet.getSlidePersistAtom();
 
             String loggerLoc = "A Notes SlideAtomSet at "+idx+" said its record was at refID "+spa.getRefID();
@@ -409,7 +409,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
             idx++;
             // Get the right core record
             SlidePersistAtom spa = sas.getSlidePersistAtom();
-            Record r = getCoreRecordForSAS(sas);
+            org.apache.poi.hslf.record.Record r = getCoreRecordForSAS(sas);
 
             // Ensure it really is a slide record
             if (!(r instanceof Slide)) {
@@ -492,7 +492,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 	 * Returns an array of the most recent version of all the interesting
 	 * records
 	 */
-	public Record[] getMostRecentCoreRecords() {
+	public org.apache.poi.hslf.record.Record[] getMostRecentCoreRecords() {
 		return _mostRecentCoreRecords;
 	}
 
@@ -611,13 +611,13 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 		_slides.get(newSlideNumber - 1).setSlideNumber(newSlideNumber);
 		_slides.get(oldSlideNumber - 1).setSlideNumber(oldSlideNumber);
 
-		ArrayList<Record> lst = new ArrayList<>();
+		ArrayList<org.apache.poi.hslf.record.Record> lst = new ArrayList<>();
 		for (SlideAtomsSet s : sas) {
 			lst.add(s.getSlidePersistAtom());
 			lst.addAll(Arrays.asList(s.getSlideRecords()));
 		}
 
-		Record[] r = lst.toArray(new Record[0]);
+		org.apache.poi.hslf.record.Record[] r = lst.toArray(new org.apache.poi.hslf.record.Record[0]);
 		slwt.setChildRecord(r);
 	}
 
@@ -646,7 +646,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 		}
 		SlideAtomsSet[] sas = slwt.getSlideAtomsSets();
 
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hslf.record.Record> records = new ArrayList<>();
 		List<SlideAtomsSet> sa = new ArrayList<>(Arrays.asList(sas));
 
 		HSLFSlide removedSlide = _slides.remove(index);
@@ -666,7 +666,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 			_documentRecord.removeSlideListWithText(slwt);
 		} else {
 			slwt.setSlideAtomsSets(sa.toArray(new SlideAtomsSet[0]));
-			slwt.setChildRecord(records.toArray(new Record[0]));
+			slwt.setChildRecord(records.toArray(new org.apache.poi.hslf.record.Record[0]));
 		}
 
 		// if the removed slide had notes - remove references to them too
@@ -690,7 +690,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 
 				if (!na.isEmpty()) {
 					nslwt.setSlideAtomsSets(na.toArray(new SlideAtomsSet[0]));
-					nslwt.setChildRecord(records.toArray(new Record[0]));
+					nslwt.setChildRecord(records.toArray(new org.apache.poi.hslf.record.Record[0]));
 				}
 			}
 			if (na.isEmpty()) {
@@ -1042,7 +1042,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 		ExEmbed exEmbed = new ExEmbed();
         // remove unneccessary infos, so we don't need to specify the type
         // of the ole object multiple times
-        Record[] children = exEmbed.getChildRecords();
+        org.apache.poi.hslf.record.Record[] children = exEmbed.getChildRecords();
         exEmbed.removeChild(children[2]);
         exEmbed.removeChild(children[3]);
         exEmbed.removeChild(children[4]);
@@ -1108,7 +1108,7 @@ public final class HSLFSlideShow implements SlideShow<HSLFShape,HSLFTextParagrap
 
     private int addPersistentObject(PositionDependentRecord slideRecord) {
     	slideRecord.setLastOnDiskOffset(HSLFSlideShowImpl.UNSET_OFFSET);
-		_hslfSlideShow.appendRootLevelRecord((Record)slideRecord);
+		_hslfSlideShow.appendRootLevelRecord((org.apache.poi.hslf.record.Record)slideRecord);
 
         // For position dependent records, hold where they were and now are
         // As we go along, update, and hand over, to any Position Dependent
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
index 4ab01f0b31..42682f550d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
@@ -83,7 +83,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
         // need to ignore already set UserEdit and PersistAtoms
         UserEditAtom userEditAtomWithEncryption = null;
         for (Map.Entry<Integer, Record> me : recordMap.descendingMap().entrySet()) {
-            Record r = me.getValue();
+            org.apache.poi.hslf.record.Record r = me.getValue();
             if (!(r instanceof UserEditAtom)) {
                 continue;
             }
@@ -99,7 +99,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
             return;
         }
 
-        Record r = recordMap.get(userEditAtomWithEncryption.getPersistPointersOffset());
+        org.apache.poi.hslf.record.Record r = recordMap.get(userEditAtomWithEncryption.getPersistPointersOffset());
         assert(r instanceof PersistPtrHolder);
         PersistPtrHolder ptr = (PersistPtrHolder)r;
 
@@ -138,7 +138,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
         return (dea != null) ? dea.getEncryptionInfo() : null;
     }
 
-    protected OutputStream encryptRecord(OutputStream plainStream, int persistId, Record record) {
+    protected OutputStream encryptRecord(OutputStream plainStream, int persistId, org.apache.poi.hslf.record.Record record) {
         boolean isPlain = (dea == null
             || record instanceof UserEditAtom
             || record instanceof PersistPtrHolder
@@ -359,7 +359,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
         }
     }
 
-    protected Record[] updateEncryptionRecord(Record[] records) {
+    protected org.apache.poi.hslf.record.Record[] updateEncryptionRecord(org.apache.poi.hslf.record.Record[] records) {
         String password = Biff8EncryptionKey.getCurrentUserPassword();
         if (password == null) {
             if (dea == null) {
@@ -396,7 +396,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
      * Before this method is called, make sure that the offsets are correct,
      * i.e. call {@link HSLFSlideShowImpl#updateAndWriteDependantRecords(OutputStream, Map)}
      */
-    protected static Record[] normalizeRecords(Record[] records) {
+    protected static org.apache.poi.hslf.record.Record[] normalizeRecords(org.apache.poi.hslf.record.Record[] records) {
         // http://msdn.microsoft.com/en-us/library/office/gg615594(v=office.14).aspx
         // repeated slideIds can be overwritten, i.e. ignored
 
@@ -406,7 +406,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
         TreeMap<Integer,Record> recordMap = new TreeMap<>();
         List<Integer> obsoleteOffsets = new ArrayList<>();
         int duplicatedCount = 0;
-        for (Record r : records) {
+        for (org.apache.poi.hslf.record.Record r : records) {
             assert(r instanceof PositionDependentRecord);
             PositionDependentRecord pdr = (PositionDependentRecord)r;
             if (pdr instanceof UserEditAtom) {
@@ -452,17 +452,17 @@ public class HSLFSlideShowEncrypted implements Closeable {
             recordMap.remove(oldOffset);
         }
 
-        return recordMap.values().toArray(new Record[0]);
+        return recordMap.values().toArray(new org.apache.poi.hslf.record.Record[0]);
     }
 
 
-    protected static Record[] removeEncryptionRecord(Record[] records) {
+    protected static org.apache.poi.hslf.record.Record[] removeEncryptionRecord(org.apache.poi.hslf.record.Record[] records) {
         int deaSlideId = -1;
         int deaOffset = -1;
         PersistPtrHolder ptr = null;
         UserEditAtom uea = null;
-        List<Record> recordList = new ArrayList<>();
-        for (Record r : records) {
+        List<org.apache.poi.hslf.record.Record> recordList = new ArrayList<>();
+        for (org.apache.poi.hslf.record.Record r : records) {
             if (r instanceof DocumentEncryptionAtom) {
                 deaOffset = ((DocumentEncryptionAtom)r).getLastOnDiskOffset();
                 continue;
@@ -496,16 +496,16 @@ public class HSLFSlideShowEncrypted implements Closeable {
 
         uea.setMaxPersistWritten(maxSlideId);
 
-        records = recordList.toArray(new Record[0]);
+        records = recordList.toArray(new org.apache.poi.hslf.record.Record[0]);
 
         return records;
     }
 
 
-    protected static Record[] addEncryptionRecord(Record[] records, DocumentEncryptionAtom dea) {
+    protected static org.apache.poi.hslf.record.Record[] addEncryptionRecord(org.apache.poi.hslf.record.Record[] records, DocumentEncryptionAtom dea) {
         assert(dea != null);
         int ueaIdx = -1, ptrIdx = -1, deaIdx = -1, idx = -1;
-        for (Record r : records) {
+        for (org.apache.poi.hslf.record.Record r : records) {
             idx++;
             if (r instanceof UserEditAtom) {
                 ueaIdx = idx;
@@ -530,7 +530,7 @@ public class HSLFSlideShowEncrypted implements Closeable {
             uea.setEncryptSessionPersistIdRef(nextSlideId);
             uea.setMaxPersistWritten(nextSlideId);
 
-            Record[] newRecords = new Record[records.length + 1];
+            org.apache.poi.hslf.record.Record[] newRecords = new org.apache.poi.hslf.record.Record[records.length + 1];
             if (ptrIdx > 0) {
                 System.arraycopy(records, 0, newRecords, 0, ptrIdx);
             }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
index 7e0860573b..9ad2c7ccde 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
@@ -82,7 +82,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
     private byte[] _docstream;
 
     // Low level contents
-    private Record[] _records;
+    private org.apache.poi.hslf.record.Record[] _records;
 
     // Raw Pictures contained in the pictures stream
     private List<HSLFPictureData> _pictures;
@@ -251,7 +251,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
         _records = read(_docstream, (int) currentUser.getCurrentEditOffset());
     }
 
-    private Record[] read(byte[] docstream, int usrOffset) throws IOException {
+    private org.apache.poi.hslf.record.Record[] read(byte[] docstream, int usrOffset) throws IOException {
         //sort found records by offset.
         //(it is not necessary but SlideShow.findMostRecentCoreRecords() expects them sorted)
         NavigableMap<Integer, Record> records = new TreeMap<>(); // offset -> record
@@ -261,7 +261,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
 
         for (Map.Entry<Integer, Record> entry : records.entrySet()) {
             Integer offset = entry.getKey();
-            Record record = entry.getValue();
+            org.apache.poi.hslf.record.Record record = entry.getValue();
             Integer persistId = persistIds.get(offset);
             if (record == null) {
                 // all plain records have been already added,
@@ -277,7 +277,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
         }
 
         decryptData.close();
-        return records.values().toArray(new Record[0]);
+        return records.values().toArray(new org.apache.poi.hslf.record.Record[0]);
     }
 
     private void initRecordOffsets(byte[] docstream, int usrOffset, NavigableMap<Integer, Record> recordMap, Map<Integer, Integer> offset2id) {
@@ -318,7 +318,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
     }
 
     public DocumentEncryptionAtom getDocumentEncryptionAtom() {
-        for (Record r : _records) {
+        for (org.apache.poi.hslf.record.Record r : _records) {
             if (r instanceof DocumentEncryptionAtom) {
                 return (DocumentEncryptionAtom) r;
             }
@@ -470,7 +470,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
         UserEditAtom usr = null;
         PersistPtrHolder ptr = null;
         CountingOS cos = new CountingOS();
-        for (Record record : _records) {
+        for (org.apache.poi.hslf.record.Record record : _records) {
             // all top level records are position dependent
             assert (record instanceof PositionDependentRecord);
             PositionDependentRecord pdr = (PositionDependentRecord) record;
@@ -512,7 +512,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
         }
 
         try (HSLFSlideShowEncrypted encData = new HSLFSlideShowEncrypted(getDocumentEncryptionAtom())) {
-            for (Record record : _records) {
+            for (org.apache.poi.hslf.record.Record record : _records) {
                 assert (record instanceof PositionDependentRecord);
                 // We've already figured out their new location, and
                 // told them that
@@ -727,7 +727,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
     @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
     public synchronized int appendRootLevelRecord(Record newRecord) {
         int addedAt = -1;
-        Record[] r = new Record[_records.length + 1];
+        org.apache.poi.hslf.record.Record[] r = new org.apache.poi.hslf.record.Record[_records.length + 1];
         boolean added = false;
         for (int i = (_records.length - 1); i >= 0; i--) {
             if (added) {
@@ -779,7 +779,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
     /**
      * Returns an array of all the records found in the slideshow
      */
-    public Record[] getRecords() {
+    public org.apache.poi.hslf.record.Record[] getRecords() {
         return _records;
     }
 
@@ -824,7 +824,7 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
     public HSLFObjectData[] getEmbeddedObjects() {
         if (_objects == null) {
             List<HSLFObjectData> objects = new ArrayList<>();
-            for (Record r : _records) {
+            for (org.apache.poi.hslf.record.Record r : _records) {
                 if (r instanceof ExOleObjStg) {
                     objects.add(new HSLFObjectData((ExOleObjStg) r));
                 }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
index ad0762de7a..dda143735a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
@@ -76,11 +76,11 @@ public final class HSLFSoundData {
      */
     public static HSLFSoundData[] find(Document document){
         ArrayList<HSLFSoundData> lst = new ArrayList<>();
-        Record[] ch = document.getChildRecords();
+        org.apache.poi.hslf.record.Record[] ch = document.getChildRecords();
         for (int i = 0; i < ch.length; i++) {
             if(ch[i].getRecordType() == RecordTypes.SoundCollection.typeID){
                 RecordContainer col = (RecordContainer)ch[i];
-                Record[] sr = col.getChildRecords();
+                org.apache.poi.hslf.record.Record[] sr = col.getChildRecords();
                 for (int j = 0; j < sr.length; j++) {
                     if(sr[j] instanceof Sound){
                         lst.add(new HSLFSoundData((Sound)sr[j]));
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
index b6e6298cd7..7923ced34a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
@@ -267,7 +267,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         _ruler = getTextRuler();
         if (_ruler == null) {
             _ruler = TextRulerAtom.getParagraphInstance();
-            Record childAfter = _byteAtom;
+            org.apache.poi.hslf.record.Record childAfter = _byteAtom;
             if (childAfter == null) {
                 childAfter = _charAtom;
             }
@@ -285,18 +285,18 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
      *
      * @return text run records
      */
-    public Record[] getRecords() {
-        Record[] r = _headerAtom.getParentRecord().getChildRecords();
+    public org.apache.poi.hslf.record.Record[] getRecords() {
+        org.apache.poi.hslf.record.Record[] r = _headerAtom.getParentRecord().getChildRecords();
         return getRecords(r, new int[] { 0 }, _headerAtom);
     }
 
-    private static Record[] getRecords(Record[] records, int[] startIdx, TextHeaderAtom headerAtom) {
+    private static org.apache.poi.hslf.record.Record[] getRecords(org.apache.poi.hslf.record.Record[] records, int[] startIdx, TextHeaderAtom headerAtom) {
         if (records == null) {
             throw new NullPointerException("records need to be set.");
         }
 
         for (; startIdx[0] < records.length; startIdx[0]++) {
-            Record r = records[startIdx[0]];
+            org.apache.poi.hslf.record.Record r = records[startIdx[0]];
             if (r instanceof TextHeaderAtom && (headerAtom == null || r == headerAtom)) {
                 break;
             }
@@ -304,18 +304,18 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
 
         if (startIdx[0] >= records.length) {
             logger.log(POILogger.INFO, "header atom wasn't found - container might contain only an OutlineTextRefAtom");
-            return new Record[0];
+            return new org.apache.poi.hslf.record.Record[0];
         }
 
         int length;
         for (length = 1; startIdx[0] + length < records.length; length++) {
-            Record r = records[startIdx[0]+length];
+            org.apache.poi.hslf.record.Record r = records[startIdx[0]+length];
             if (r instanceof TextHeaderAtom || r instanceof SlidePersistAtom) {
                 break;
             }
         }
 
-        Record[] result = new Record[length];
+        org.apache.poi.hslf.record.Record[] result = new org.apache.poi.hslf.record.Record[length];
         System.arraycopy(records, startIdx[0], result, 0, length);
         startIdx[0] += length;
 
@@ -932,7 +932,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
     private static StyleTextPropAtom findStyleAtomPresent(TextHeaderAtom header, int textLen) {
         boolean afterHeader = false;
         StyleTextPropAtom style = null;
-        for (Record record : header.getParentRecord().getChildRecords()) {
+        for (org.apache.poi.hslf.record.Record record : header.getParentRecord().getChildRecords()) {
             long rt = record.getRecordType();
             if (afterHeader && rt == RecordTypes.TextHeaderAtom.typeID) {
                 // already on the next header, quit searching
@@ -989,7 +989,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         StyleTextPropAtom styleAtom = findStyleAtomPresent(headerAtom, rawText.length());
 
         // Store in the appropriate record
-        Record oldRecord = null, newRecord;
+        org.apache.poi.hslf.record.Record oldRecord = null, newRecord;
         if (isUnicode) {
             if (byteAtom != null || charAtom == null) {
                 oldRecord = byteAtom;
@@ -1010,10 +1010,10 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         assert (newRecord != null);
 
         RecordContainer _txtbox = headerAtom.getParentRecord();
-        Record[] cr = _txtbox.getChildRecords();
+        org.apache.poi.hslf.record.Record[] cr = _txtbox.getChildRecords();
         int /* headerIdx = -1, */ textIdx = -1, styleIdx = -1;
         for (int i = 0; i < cr.length; i++) {
-            Record r = cr[i];
+            org.apache.poi.hslf.record.Record r = cr[i];
             if (r == headerAtom) {
                 // headerIdx = i;
             } else if (r == oldRecord || r == newRecord) {
@@ -1099,7 +1099,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
 
         // If TextSpecInfoAtom is present, we must update the text size in it,
         // otherwise the ppt will be corrupted
-        for (Record r : paragraphs.get(0).getRecords()) {
+        for (org.apache.poi.hslf.record.Record r : paragraphs.get(0).getRecords()) {
             if (r instanceof TextSpecInfoAtom) {
                 ((TextSpecInfoAtom) r).setParentSize(rawText.length() + 1);
                 break;
@@ -1111,7 +1111,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
         TextHeaderAtom headerAtom = paragraphs.get(0)._headerAtom;
         RecordContainer _txtbox = headerAtom.getParentRecord();
         // remove existing hyperlink records
-        for (Record r : _txtbox.getChildRecords()) {
+        for (org.apache.poi.hslf.record.Record r : _txtbox.getChildRecords()) {
             if (r instanceof InteractiveInfo || r instanceof TxInteractiveInfoAtom) {
                 _txtbox.removeChild(r);
             }
@@ -1403,7 +1403,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
      *
      * @param records the records to build from
      */
-    protected static List<List<HSLFTextParagraph>> findTextParagraphs(Record[] records) {
+    protected static List<List<HSLFTextParagraph>> findTextParagraphs(org.apache.poi.hslf.record.Record[] records) {
         List<List<HSLFTextParagraph>> paragraphCollection = new ArrayList<>();
 
         int[] recordIdx = { 0 };
@@ -1415,7 +1415,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
             TextRulerAtom ruler = null;
             MasterTextPropAtom indents = null;
 
-            for (Record r : getRecords(records, recordIdx, null)) {
+            for (org.apache.poi.hslf.record.Record r : getRecords(records, recordIdx, null)) {
                 long rt = r.getRecordType();
                 if (RecordTypes.TextHeaderAtom.typeID == rt) {
                     header = (TextHeaderAtom) r;
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
index 27956dd3d2..01376c17f9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
@@ -47,7 +47,7 @@ public final class TestRecordContainer {
         is.close();
 
         Record[] r = hss.getRecords();
-        for (Record rec : r) {
+        for ( org.apache.poi.hslf.record.Record rec : r) {
             if(rec instanceof RecordContainer) {
                 recordContainer = (RecordContainer)rec;
                 return;
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
index 6829d72886..f998ef82e4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
@@ -42,7 +42,7 @@ public final class TestSound {
 		Document doc = ppt.getDocumentRecord();
 		SoundCollection soundCollection = null;
 		Record[] doc_ch = doc.getChildRecords();
-		for (Record rec : doc_ch) {
+		for ( org.apache.poi.hslf.record.Record rec : doc_ch) {
 			if (rec instanceof SoundCollection) {
 				soundCollection = (SoundCollection) rec;
 				break;
@@ -53,7 +53,7 @@ public final class TestSound {
 		Sound sound = null;
 		Record[] sound_ch = soundCollection.getChildRecords();
 		int k = 0;
-		for (Record rec : sound_ch) {
+		for ( org.apache.poi.hslf.record.Record rec : sound_ch) {
 			if (rec instanceof Sound) {
 				sound = (Sound) rec;
 				k++;
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
index 523f6ad7d2..6466ed38e4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
@@ -81,7 +81,7 @@ public final class TestAddingSlides {
         // grab UserEditAtom
         UserEditAtom usredit = null;
         Record[] _records = ss_empty.getSlideShowImpl().getRecords();
-        for (Record record : _records) {
+        for ( org.apache.poi.hslf.record.Record record : _records) {
             if (record.getRecordType() == RecordTypes.UserEditAtom.typeID) {
                 usredit = (UserEditAtom) record;
             }
@@ -169,7 +169,7 @@ public final class TestAddingSlides {
         // grab UserEditAtom
         UserEditAtom usredit = null;
         Record[] _records = ss_two.getSlideShowImpl().getRecords();
-        for (Record record : _records) {
+        for ( org.apache.poi.hslf.record.Record record : _records) {
             if (record.getRecordType() == RecordTypes.UserEditAtom.typeID) {
                 usredit = (UserEditAtom) record;
             }
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
index 43a855c8f7..e23f158703 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
@@ -517,7 +517,7 @@ public final class TestBugs {
         SlideAtomsSet s1 = slidesSLWT.getSlideAtomsSets()[0];
 
         int tha = 0;
-        for (Record r : s1.getSlideRecords()) {
+        for ( org.apache.poi.hslf.record.Record r : s1.getSlideRecords()) {
             if (r instanceof TextHeaderAtom) {
                 tha++;
             }
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
index a952bca5cd..c1a5324612 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
@@ -44,7 +44,7 @@ public final class TestMostRecentRecords {
 	@Test
 	public void testCount() {
 		// Most recent core records
-		Record[] mrcr = ss.getMostRecentCoreRecords();
+		 org.apache.poi.hslf.record.Record[] mrcr = ss.getMostRecentCoreRecords();
 
 		// Master sheet + master notes + 2 slides + 2 notes + document
 		assertEquals(7, mrcr.length);
@@ -53,7 +53,7 @@ public final class TestMostRecentRecords {
 	@Test
 	public void testRightRecordTypes() {
 		// Most recent core records
-		Record[] mrcr = ss.getMostRecentCoreRecords();
+		 org.apache.poi.hslf.record.Record[] mrcr = ss.getMostRecentCoreRecords();
 
 		// Document
 		assertEquals(1000, mrcr[0].getRecordType());
@@ -75,10 +75,10 @@ public final class TestMostRecentRecords {
 	@Test
 	public void testCorrectRecords() {
 		// Most recent core records
-		Record[] mrcr = ss.getMostRecentCoreRecords();
+		 org.apache.poi.hslf.record.Record[] mrcr = ss.getMostRecentCoreRecords();
 
 		// All records
-		Record[] allr = hss.getRecords();
+		 org.apache.poi.hslf.record.Record[] allr = hss.getRecords();
 
 		// Ensure they are the right (latest) version of each
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
index b707df2236..d79f61e411 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
@@ -46,20 +46,20 @@ public final class TestRecordSetup {
 
 	@Test
 	public void testHandleParentAwareRecords() {
-		Record[] records = hss.getRecords();
-		for (Record record : records) {
+		 org.apache.poi.hslf.record.Record[] records = hss.getRecords();
+		for ( org.apache.poi.hslf.record.Record record : records) {
 			ensureParentAware(record,null);
 		}
 	}
-	private void ensureParentAware(Record r,RecordContainer parent) {
+	private void ensureParentAware( org.apache.poi.hslf.record.Record r,RecordContainer parent) {
 		if(r instanceof ParentAwareRecord) {
 			ParentAwareRecord pr = (ParentAwareRecord)r;
 			assertEquals(parent, pr.getParentRecord());
 		}
 		if(r instanceof RecordContainer) {
 			RecordContainer rc = (RecordContainer)r;
-			Record[] children = rc.getChildRecords();
-			for (Record rec : children) {
+			 org.apache.poi.hslf.record.Record[] children = rc.getChildRecords();
+			for ( org.apache.poi.hslf.record.Record rec : children) {
 				ensureParentAware(rec, rc);
 			}
 		}
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
index d50b2deda9..b697ab10a8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
@@ -418,7 +418,7 @@ public final class TestRichTextRun {
 		assertArrayEquals(raw_file, raw_ss);
 	}
 
-	private byte[] writeRecord(Record r) throws IOException {
+	private byte[] writeRecord( org.apache.poi.hslf.record.Record r) throws IOException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		r.writeOut(baos);
 		return baos.toByteArray();
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
index 12066f99d4..327720cb85 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
@@ -129,7 +129,7 @@ public final class TestTextRun {
         TextHeaderAtom tha = null;
         TextBytesAtom tba = null;
         TextCharsAtom tca = null;
-		for (Record r : para.getRecords()) {
+		for ( org.apache.poi.hslf.record.Record r : para.getRecords()) {
 		    if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
 		    else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
 		    else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
@@ -145,7 +145,7 @@ public final class TestTextRun {
 		HSLFTextParagraph.setText(paras, changeBytesOnly);
 		para = paras.get(0);
 		tha = null; tba = null; tca = null;
-        for (Record r : para.getRecords()) {
+        for ( org.apache.poi.hslf.record.Record r : para.getRecords()) {
             if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
             else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
             else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
@@ -164,7 +164,7 @@ public final class TestTextRun {
 		HSLFTextParagraph.setText(paras, changeByteChar);
 		para = paras.get(0);
         tha = null; tba = null; tca = null;
-        for (Record r : para.getRecords()) {
+        for ( org.apache.poi.hslf.record.Record r : para.getRecords()) {
             if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
             else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
             else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
@@ -183,7 +183,7 @@ public final class TestTextRun {
 		HSLFTextParagraph.setText(paras, changeCharChar);
         para = paras.get(0);
         tha = null; tba = null; tca = null;
-        for (Record r : para.getRecords()) {
+        for ( org.apache.poi.hslf.record.Record r : para.getRecords()) {
             if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
             else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
             else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
@@ -525,8 +525,8 @@ public final class TestTextRun {
                 HSLFTextShape tx = (HSLFTextShape)sh;
                 List<HSLFTextParagraph> paras = tx.getTextParagraphs();
                 //verify that records cached in  TextRun and EscherTextboxWrapper are the same
-                Record[] runChildren = paras.get(0).getRecords();
-                Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords();
+                 org.apache.poi.hslf.record.Record[] runChildren = paras.get(0).getRecords();
+                 org.apache.poi.hslf.record.Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords();
                 assertEquals(runChildren.length, txboxChildren.length);
                 for(int i=0; i < txboxChildren.length; i++){
                     assertSame(txboxChildren[i], runChildren[i]);